/ Check-in [64372800]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Whoops, that shouldn't have been in the merge. Removed buggy code.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | lemon-update-2010
Files: files | file ages | folders
SHA1:643728003218c9841425dffb6fe506763859fd37
User & Date: icculus 2010-03-03 17:06:32
Context
2010-03-03
17:09
Fixed compiler warning on Visual Studio. check-in: 83495128 user: icculus tags: lemon-update-2010
17:06
Whoops, that shouldn't have been in the merge. Removed buggy code. check-in: 64372800 user: icculus tags: lemon-update-2010
17:00
Use Strsafe() instead of strdup(). Fixes Visual Studio complaining. check-in: 89d8f98e user: icculus tags: lemon-update-2010
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to tool/lemon.c.

  2280   2280       case WAITING_FOR_DESTRUCTOR_SYMBOL:
  2281   2281         if( !isalpha(x[0]) ){
  2282   2282           ErrorMsg(psp->filename,psp->tokenlineno,
  2283   2283             "Symbol name missing after %%destructor keyword");
  2284   2284           psp->errorcnt++;
  2285   2285           psp->state = RESYNC_AFTER_DECL_ERROR;
  2286   2286         }else{
  2287         -        struct symbol *sp = Symbol_find(x);
  2288         -        if((sp) && (sp->datatype)){
  2289         -          ErrorMsg(psp->filename,psp->tokenlineno,
  2290         -            "Symbol %%destructor \"%s\" already defined", x);
  2291         -          psp->errorcnt++;
  2292         -          psp->state = RESYNC_AFTER_DECL_ERROR;
  2293         -        }else{
  2294         -          if (!sp){
  2295         -            sp = Symbol_new(x);
  2296         -          }
  2297         -          psp->declargslot = &sp->destructor;
  2298         -          psp->decllinenoslot = &sp->destLineno;
  2299         -          psp->insertLineMacro = 1;
  2300         -          psp->state = WAITING_FOR_DECL_ARG;
  2301         -        }
         2287  +        struct symbol *sp = Symbol_new(x);
         2288  +        psp->declargslot = &sp->destructor;
         2289  +        psp->decllinenoslot = &sp->destLineno;
         2290  +        psp->insertLineMacro = 1;
         2291  +        psp->state = WAITING_FOR_DECL_ARG;
  2302   2292         }
  2303   2293         break;
  2304   2294       case WAITING_FOR_DATATYPE_SYMBOL:
  2305   2295         if( !isalpha(x[0]) ){
  2306   2296           ErrorMsg(psp->filename,psp->tokenlineno,
  2307   2297             "Symbol name missing after %%type keyword");
  2308   2298           psp->errorcnt++;