# HG changeset patch # User mario # Date 1174981171 -7200 # Node ID 81a06a308b7ecd47fe7068dccfda5a32fe4ff413 # Parent cee3c4e5afe2c7ca081d48524e91d4f4a916a567 *** empty log message *** diff -r cee3c4e5afe2 -r 81a06a308b7e stage1_2/iec.y --- a/stage1_2/iec.y Wed Feb 28 15:55:41 2007 +0100 +++ b/stage1_2/iec.y Tue Mar 27 09:39:31 2007 +0200 @@ -70,7 +70,7 @@ * Printing of debug info must then be activated by setting * the variable yydebug to 1. */ -#define YYDEBUG 0 +#define YYDEBUG 1 /* file with declaration of absyntax classes... */ @@ -151,7 +151,7 @@ -%glr-parser +// %glr-parser // %expect-rr 1 @@ -5063,6 +5063,8 @@ case_element: case_list ':' statement_list {$$ = new case_element_c($1, $3);} +| case_list ':' statement_list identifier BOGUS_TOKEN_ID + {$$ = new case_element_c($1, $3); ERROR;} ; diff -r cee3c4e5afe2 -r 81a06a308b7e stage1_2/stage1_2.cc --- a/stage1_2/stage1_2.cc Wed Feb 28 15:55:41 2007 +0100 +++ b/stage1_2/stage1_2.cc Tue Mar 27 09:39:31 2007 +0200 @@ -29,6 +29,9 @@ */ +/* file with declaration of absyntax classes... */ +#include "../absyntax/absyntax.hh" + // #include "stage1_2.hh" #include "iec.y.hh" diff -r cee3c4e5afe2 -r 81a06a308b7e stage1_2/stage1_2_priv.hh --- a/stage1_2/stage1_2_priv.hh Wed Feb 28 15:55:41 2007 +0100 +++ b/stage1_2/stage1_2_priv.hh Tue Mar 27 09:39:31 2007 +0200 @@ -29,6 +29,17 @@ +/* !!! WARNING !!! + * + * Whoever includes this file (stage1_2_priv.hh) will need + * to first inlcude iec.y.hh !! + * + * Read other comments further down to understand why we don't + * include iec.y.hh in this file. + */ + + + /* file with the declarations of symbol tables... */ #include "../util/symtable.hh" @@ -89,7 +100,7 @@ /* NOTE: BOGUS_TOKEN_ID is defined in the bison generated file iec.y.hh. * We need this constant defined before we can declare the symbol tables. * However, we cannot #include "iec.y.hh" in this file (stage1_2_priv.hh) directly - * because of the way bison ver. 3.2 is copying all declarations in the prologue + * because of the way bison ver. 2.3 is copying all declarations in the prologue * of iec.y to the iec.y.hh file (including an #include stage1_2_priv.hh). * So, if we were to include "iec.y.hh" here, we would get a circular include. * All this means that whoever includes this file (stage1_2_priv.hh) will need