1*4882a593SmuzhiyunFrom d92b11fea65364fefa700249bd3340e0cd4c5b31 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Dmitry Shachnev <mitya57@gmail.com> 3*4882a593SmuzhiyunDate: Tue, 4 Aug 2020 21:04:06 +0300 4*4882a593SmuzhiyunSubject: [PATCH] Let Bison generate the header directly, to fix build with 5*4882a593Smuzhiyun Bison 3.7 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunStarting with Bison 3.7, the generated C++ file #include's the header 8*4882a593Smuzhiyunby default, instead of duplicating it. So we should not delete it. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunRemove the code to add #ifdef guards to the header, since Bison adds 11*4882a593Smuzhiyunthem itself since version 2.6.3. 12*4882a593SmuzhiyunSigned-off-by: James Hilliard <james.hilliard1@gmail.com> 13*4882a593Smuzhiyun[james.hilliard1@gmail.com: backport from upstream commit 14*4882a593Smuzhiyund92b11fea65364fefa700249bd3340e0cd4c5b31] 15*4882a593Smuzhiyun--- 16*4882a593Smuzhiyun Source/WebCore/css/makegrammar.pl | 21 +-------------------- 17*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 20 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/Source/WebCore/css/makegrammar.pl b/Source/WebCore/css/makegrammar.pl 20*4882a593Smuzhiyunindex 5d63b08102eb..9435701c7061 100644 21*4882a593Smuzhiyun--- a/Source/WebCore/css/makegrammar.pl 22*4882a593Smuzhiyun+++ b/Source/WebCore/css/makegrammar.pl 23*4882a593Smuzhiyun@@ -73,25 +73,6 @@ if ($suffix eq ".y.in") { 24*4882a593Smuzhiyun } 25*4882a593Smuzhiyun 26*4882a593Smuzhiyun my $fileBase = File::Spec->join($outputDir, $filename); 27*4882a593Smuzhiyun-my @bisonCommand = ($bison, "-d", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); 28*4882a593Smuzhiyun+my @bisonCommand = ($bison, "--defines=$fileBase.h", "-p", $symbolsPrefix, $grammarFilePath, "-o", "$fileBase.cpp"); 29*4882a593Smuzhiyun push @bisonCommand, "--no-lines" if $^O eq "MSWin32"; # Work around bug in bison >= 3.0 on Windows where it puts backslashes into #line directives. 30*4882a593Smuzhiyun system(@bisonCommand) == 0 or die; 31*4882a593Smuzhiyun- 32*4882a593Smuzhiyun-open HEADER, ">$fileBase.h" or die; 33*4882a593Smuzhiyun-print HEADER << "EOF"; 34*4882a593Smuzhiyun-#ifndef CSSGRAMMAR_H 35*4882a593Smuzhiyun-#define CSSGRAMMAR_H 36*4882a593Smuzhiyun-EOF 37*4882a593Smuzhiyun- 38*4882a593Smuzhiyun-open HPP, "<$fileBase.cpp.h" or open HPP, "<$fileBase.hpp" or die; 39*4882a593Smuzhiyun-while (<HPP>) { 40*4882a593Smuzhiyun- print HEADER; 41*4882a593Smuzhiyun-} 42*4882a593Smuzhiyun-close HPP; 43*4882a593Smuzhiyun- 44*4882a593Smuzhiyun-print HEADER "#endif\n"; 45*4882a593Smuzhiyun-close HEADER; 46*4882a593Smuzhiyun- 47*4882a593Smuzhiyun-unlink("$fileBase.cpp.h"); 48*4882a593Smuzhiyun-unlink("$fileBase.hpp"); 49*4882a593Smuzhiyun- 50*4882a593Smuzhiyun-- 51*4882a593Smuzhiyun2.25.1 52*4882a593Smuzhiyun 53