Merged trunk to lemon-update-2010 branch.

FossilOrigin-Name: 88b466bae47d006c48eff42ab271f05ff56d5ed1

diff --cc configure
index 5ce6104f00d0430a5547f64a5a70281b252916e6,a95c3b3c29928d73983c0e3a398c163eb980eaf1..a95c3b3c29928d73983c0e3a398c163eb980eaf1
mode 100644,100755..100644
--- 1/configure
--- 2/configure
+++ b/configure

diff --cc manifest
index d58441f0a1b54b8132d0d839694e7c7e2c0aea87,ad4a0a60d8fa3b00cb7d369df8a64373324cb9fc..25dc3197168134160ab1a47d16830a37b88d4815
--- 1/manifest
--- 2/manifest
+++ b/manifest
@@@ -1,14 -1,11 +1,14 @@@
 -C Fix\ssome\sextra\sinstances\sof\sthe\sconstants\saddressed\sby\s[83e47ca006].
 -D 2010-03-03T16:02:06
 +-----BEGIN PGP SIGNED MESSAGE-----
 +Hash: SHA1
 +
- C Repore\serror\sif\sthe\sgrammar\shas\smultiple\s%type\slines\sfor\sthe\ssame\snonterminal.
- D 2010-02-17T20:31:32
++C Merged\strunk\sto\slemon-update-2010\sbranch.
++D 2010-03-03T16:54:58
  F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
- F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
+ F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b
  F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
- F Makefile.vxworks 10010ddbf52e2503c7c49c7c0b7c7a096f8638a6
+ F Makefile.vxworks ab005d301296c40e021ccd0133ce49ca811e319f
  F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
- F VERSION 2f8d921ecf804e9eb01e836a09512d0318ebd4d3
+ F VERSION 3e18b3dd7290883913c25d66c0ddb409ce318654
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
  F addopcodes.awk 17dc593f791f874d2c23a0f9360850ded0286531
  F art/2005osaward.gif 0d1851b2a7c1c9d0ccce545f3e14bca42d7fd248
@@@ -22,7 -19,7 +22,7 @@@ F art/src_logo.gif 9341ef09f0e53cd44c0c
  F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
  F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673
  F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
- F configure 8bcd25791aa958ecb255385d1c2d91ab1c5acd93
 -F configure 72c0ad7c8cfabbffeaf8ca61e1d24143cf857eb2 x
++F configure 72c0ad7c8cfabbffeaf8ca61e1d24143cf857eb2
  F configure.ac 14740970ddb674d92a9f5da89083dff1179014ff
  F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
  F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
@@@ -765,7 -767,7 +770,7 @@@ F tool/diffdb.c 7524b1b5df217c20cd0431f
  F tool/fragck.tcl 5265a95126abcf6ab357f7efa544787e5963f439
  F tool/genfkey.README cf68fddd4643bbe3ff8e31b8b6d8b0a1b85e20f4
  F tool/genfkey.test 4196a8928b78f51d54ef58e99e99401ab2f0a7e5
--F tool/lemon.c 651d2564255b78e9eef5ed23156a879b5fefad33
++F tool/lemon.c 497c3d3d2e5436ed92383572aea1cbc1f0d218e2
  F tool/lempar.c 01ca97f87610d1dac6d8cd96ab109ab1130e76dc
  F tool/mkkeywordhash.c d2e6b4a5965e23afb80fbe74bb54648cd371f309
  F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
@@@ -790,24 -792,7 +795,24 @@@ F tool/speedtest2.tcl ee2149167303ba8e9
  F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
  F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
  F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
- P f96add898f096cfc1e435c625ce74093d790b3c7
- R 7e899bd1bcc574c9843dd06c1121722a
 -P 83e47ca0069de259e98798d84d88301a5b4b6d2e
 -R b254a895c1aed55531168a2f7a11c1dc
 -U dan
 -Z f02550fa435e14ac73a675de6c737016
++P 721f33e7221c5fc907e9e293ac3242843f4fcfb7 0354ab279f0ea9915a14d1ed972b4aa6b5a27fd1
++R 18d01086479708c87803dc99d2c49f89
 +U icculus
- Z 8f255c204179bde4f6c556d2f0460a83
++Z 9b9dcef6643d1dec8bfe9418568362a1
 +-----BEGIN PGP SIGNATURE-----
 +Version: GnuPG/MacGPG2 v2.0.14 (Darwin)
 +
- iQIcBAEBAgAGBQJLfFIoAAoJEDDcKcGyC63Vl/cP/0fu13mQtPcWgZ3eFXy1fHh6
- Z0BV928SNvrUVTOxn6Nv8pE3vnN+aX6a1dN07R8G0W9OyvAltCorydnC4iUh72aO
- gvjW5Ls5yB2G2Zwofe6EmML5x5LbheRzpM0d5vsm/ic8kPqcQR2irLt5x+VTlEx5
- s71sr6Vu16j06DuxW1YnB3NQuncErYDbSMNPlCzVIt/5DWB/ELUmX4dBmzsQ5LbM
- MXLnVHoWNbUSaZuslE1g9ImwFlwBFFotRIYStxN08Z/nRngK/LJqA5tO3FdS58ls
- II2h4GJtxxwIjqK+QHE4DMF94ShlpUmHuTkCQYiDK19wOcpYVva+Cpb2mJ1d057I
- TSPIxbmAY1QBsBULSqOhuRgPuZcUmaFjG6UsPavsQC+TMUCD0F+uww0ZFM7sbo+p
- /wiGhqGapJ+OjGlZGOlTj5mFA4Be5ERJf/Dcz9O/i81eQNA30aMLWWWnbwTO36QY
- xea6PmUdLsLUVyh89lwv2zGrqQsDyRBbapf8odCyEQVjaXfaqOygLQJbkxITk21w
- Dej4oxBT2BP0S9kQPvQlL+w2fe36OEtTG2GLQD2Yr10T6hEkhpJPcL+pSNO11uRF
- uXxJ4qrPJ0Ob+pPzkHqn+2jMbrPzv95M7/I0TAXx5eocpgvY0fs4WMm8DAmZ73Et
- 3e3nSqkoZwLjXJg1OVF9
- =g0CB
++iQIcBAEBAgAGBQJLjpRmAAoJEDDcKcGyC63VxegP/iMH8iUUtG+O0FI4UgZvCLbP
++AIgIZaABtQ6cEm67sHppM8Nk9FaffjWPFEnfkfyHSEAtuH4cMiwfa+YrrDnGXcO6
++DqHsQlp15lB+ic0AF+r6ukGW69dMU78NMu/cAgX/0Axx7xW1P6/LgldrsIm8lrRx
++uVIBekaVD8FkF1K8Ne8sRd/C1/IFc1WsyJj8+8fvuMjP/opGxjpCPevIO8FFAtaz
++x5WCWZOowiNnn2WpYmjnZkPkxXK8vr0PEttq3XE7zsOjhTAgUEHFRrhmIex5rH4M
++BQW9xHheeRj247qqO+nonxcxSE0o67hUOMfmh/MS01umzpRcsvTy8CLp2HM2Kphc
++SSnt5Adt3ZBjo8XMwrTz6puBn8CGXI/wtS1G+cdOCNwlusRV1iV0Yu8JLqSIyOhw
++1KXCA+RqODCcrqjQ3g/mBB9QGTzjFWWTnoqniUSDI8WbYVzoi79DTRwZzSA6K8E6
++oVZ5SRkqJYJ2jV+t8CsYwktzmWdnFE4JdKsLp3RP631ofKZHM3X5hEpbI9CvsNID
++8BiDEDbFPz4kAw/VioODH2wGwiKKehulDTJPYtjl2MXhXW2buqvR2NFuIMKjmRx/
+++r19lL6x5ZIG+Ogq3wYwGuGNWL/4WkNLg3zJwb7FcoWDGR9h51ebpC9SHCN6d4nb
++1MwJz1XjJ8qJdoVwpwZ6
++=Ux8K
 +-----END PGP SIGNATURE-----

diff --cc manifest.uuid
index 4d571f7197669bb79ff438a94c22cbeb3fcae614,e0189ea52b25d5bc27f9e6b7f6ea97bb922e81e3..5a7f57f511f8a7aeb4f1325c07ec282ed0c0a04c
--- 1/manifest.uuid
--- 2/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 721f33e7221c5fc907e9e293ac3242843f4fcfb7
 -0354ab279f0ea9915a14d1ed972b4aa6b5a27fd1
++88b466bae47d006c48eff42ab271f05ff56d5ed1

diff --cc tool/lemon.c
index f05e9e6ce112821c1dd8a5e5e022e1b1d4f6dc82,f05e9e6ce112821c1dd8a5e5e022e1b1d4f6dc82..8946f145520d55279e52c876eecdd2a041e4006f
--- 1/tool/lemon.c
--- 2/tool/lemon.c
+++ b/tool/lemon.c
@@@ -2285,11 -2285,11 +2285,21 @@@ to follow the previous rule.")
          psp->errorcnt++;
          psp->state = RESYNC_AFTER_DECL_ERROR;
        }else{
--        struct symbol *sp = Symbol_new(x);
--        psp->declargslot = &sp->destructor;
--        psp->decllinenoslot = &sp->destLineno;
--        psp->insertLineMacro = 1;
--        psp->state = WAITING_FOR_DECL_ARG;
++        struct symbol *sp = Symbol_find(x);
++        if((sp) && (sp->datatype)){
++          ErrorMsg(psp->filename,psp->tokenlineno,
++            "Symbol %%destructor \"%s\" already defined", x);
++          psp->errorcnt++;
++          psp->state = RESYNC_AFTER_DECL_ERROR;
++        }else{
++          if (!sp){
++            sp = Symbol_new(x);
++          }
++          psp->declargslot = &sp->destructor;
++          psp->decllinenoslot = &sp->destLineno;
++          psp->insertLineMacro = 1;
++          psp->state = WAITING_FOR_DECL_ARG;
++        }
        }
        break;
      case WAITING_FOR_DATATYPE_SYMBOL: