Modify the lemon parser template to avoid using zero-initialized constants

when compiled with C++.  Ticket #3288. (CVS 5571)

FossilOrigin-Name: 71992f4a3723418df5f16093aec92f1f95f0b604

diff --git a/manifest b/manifest
index 8436afc5ddc4a09a85081f07ec645ddc12e35253..dd6c432079787219a59d4d062ccb9708986a4255 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\sin\sMakefile.in\scausing\sthe\sstatic\sfunction\shash-table\sto\sbe\sconstructed\sincorrectly\s(segfault).\s(CVS\s5570)
-D 2008-08-20T17:19:09
+C Modify\sthe\slemon\sparser\stemplate\sto\savoid\susing\szero-initialized\sconstants\nwhen\scompiled\swith\sC++.\s\sTicket\s#3288.\s(CVS\s5571)
+D 2008-08-20T17:48:21
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 0b1c022000f55221454a7846022f11674d8024bf
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -601,7 +601,7 @@ F test/zeroblob.test 792124852ec61458a2eb527b5091791215e0be95
 F tool/diffdb.c 7524b1b5df217c20cd0431f6789851a4e0cb191b
 F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
 F tool/lemon.c 6cb39632ef3bfec2cea8f81b4d7f63c09fe12802
-F tool/lempar.c 4d115ee7c0c8a749d5b22abed731abb4e6546a5f
+F tool/lempar.c 770dc64b74429daf9611676f43bfbd7c1bed0152
 F tool/memleak.awk 4e7690a51bf3ed757e611273d43fe3f65b510133
 F tool/memleak2.awk 9cc20c8e8f3c675efac71ea0721ee6874a1566e8
 F tool/memleak3.tcl 7707006ee908cffff210c98158788d85bb3fcdbf
@@ -623,7 +623,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P daf730d1defa78fb8b80a78f9108ac35a13e09f6
-R b79a56fc932a7481bbcd0d70a36d4d90
-U danielk1977
-Z 6de013809c68fdf776550beacde7663f
+P aef5b909e960c31527c795bc09a1de846f8afcbb
+R ba6058aa52b7f536a969626105129ff5
+U drh
+Z a81a89f6460671859f4d4500f7e3aaad

diff --git a/manifest.uuid b/manifest.uuid
index 7cd5945c2fed74a3f767ebcc9d593819471a8b49..dea47014ecd85dac532ff356d148d490a01f56bf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-aef5b909e960c31527c795bc09a1de846f8afcbb
\ No newline at end of file
+71992f4a3723418df5f16093aec92f1f95f0b604
\ No newline at end of file

diff --git a/tool/lempar.c b/tool/lempar.c
index f5fafd4c28b583058a3267ca69fb07dfc03df969..5fad6cec50bb31f131519164c5b240fa6ca3fca3 100644 (file)
--- a/tool/lempar.c
+++ b/tool/lempar.c
@@ -62,7 +62,11 @@
 
 /* The yyzerominor constant is used to initialize instances of
 ** YYMINORTYPE objects to zero. */
+#ifdef __cplusplus
+static YYMINORTYPE yyzerominor;
+#else
 static const YYMINORTYPE yyzerominor;
+#endif
 
 /* Next are the tables used to determine what action to take based on the
 ** current state and lookahead token.  These tables are used to implement