Commit acc1c38c authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev

Fixed up makegrammar.pl

parent 5f399ee8
diff -uNr qtwebkit-5.212.0-alpha4/Source/WebCore/CMakeLists.txt qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/CMakeLists.txt
--- qtwebkit-5.212.0-alpha4/Source/WebCore/CMakeLists.txt 2020-03-05 03:46:37.000000000 +1030
+++ qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/CMakeLists.txt 2025-11-04 14:08:52.238983071 +1030
@@ -3581,10 +3581,10 @@
list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/PlugInsResourcesData.cpp)
ADD_SOURCE_WEBCORE_DERIVED_DEPENDENCIES(${WEBCORE_DIR}/css/StyleResolver.cpp PlugInsResourcesData.cpp PlugInsResources.h)
-GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
+GENERATE_GRAMMAR(cssyy ${WEBCORE_DIR}/css/CSSGrammar.y.in ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.hpp ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp "${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/CSSGrammar.cpp)
-GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.h ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp "")
+GENERATE_GRAMMAR(xpathyy ${WEBCORE_DIR}/xml/XPathGrammar.y ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.hpp ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp "")
list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/XPathGrammar.cpp)
diff -uNr qtwebkit-5.212.0-alpha4/Source/WebCore/css/CSSParser.cpp qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/css/CSSParser.cpp
--- qtwebkit-5.212.0-alpha4/Source/WebCore/css/CSSParser.cpp 2020-03-05 03:46:37.000000000 +1030
+++ qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/css/CSSParser.cpp 2025-11-04 14:08:04.137944428 +1030
@@ -11158,7 +11158,7 @@
#define END_TOKEN 0
-#include "CSSGrammar.h"
+#include "CSSGrammar.hpp"
enum CharacterType {
// Types for the main switch.
diff -uNr qtwebkit-5.212.0-alpha4/Source/WebCore/xml/XPathParser.cpp qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/xml/XPathParser.cpp
--- qtwebkit-5.212.0-alpha4/Source/WebCore/xml/XPathParser.cpp 2020-03-05 03:46:37.000000000 +1030
+++ qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/xml/XPathParser.cpp 2025-11-04 14:08:55.789912025 +1030
@@ -42,7 +42,7 @@
extern int xpathyyparse(Parser&);
-#include "XPathGrammar.h"
+#include "XPathGrammar.hpp"
namespace WebCore {
namespace XPath {
diff -uNr qtwebkit-5.212.0-alpha4/Source/WebCore/css/makegrammar.pl qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/css/makegrammar.pl
--- qtwebkit-5.212.0-alpha4/Source/WebCore/css/makegrammar.pl 2020-03-05 03:46:37.000000000 +1030
+++ qtwebkit-5.212.0-alpha4-fix_bison/Source/WebCore/css/makegrammar.pl 2025-11-04 17:31:11.137278532 +1030
@@ -92,6 +92,7 @@
print HEADER "#endif\n";
close HEADER;
+if (-e "$fileBase.h") {
+ rename("$fileBase.h", "$fileBase.hpp") or die "Cannot rename $fileBase.h to $fileBase.hpp: $!";
+}
unlink("$fileBase.cpp.h");
-unlink("$fileBase.hpp");
-
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment