=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.20 retrieving revision 1.22 diff -u -p -r1.20 -r1.22 --- OpenXM_contrib2/asir2000/parse/parse.y 2003/05/23 00:11:59 1.20 +++ OpenXM_contrib2/asir2000/parse/parse.y 2003/12/01 02:18:53 1.22 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.19 2003/05/20 06:15:01 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.21 2003/05/30 00:47:25 noro Exp $ */ %{ #define malloc(x) GC_malloc(x) @@ -90,7 +90,7 @@ extern jmp_buf env; } %token STRUCT POINT NEWSTRUCT ANS FDEF PFDEF MODDEF MODEND -%token GLOBAL MGLOBAL LOCAL LOCALF CMP OR AND CAR CDR QUOTED +%token GLOBAL MGLOBAL LOCAL LOCALF CMP OR AND CAR CDR QUOTED COLONCOLON %token DO WHILE FOR IF ELSE BREAK RETURN CONTINUE PARIF MAP RECMAP TIMER GF2NGEN GFPNGEN GFSNGEN GETOPT %token FOP_AND FOP_OR FOP_IMPL FOP_REPL FOP_EQUIV FOP_NOT LOP %token

FORMULA UCASE LCASE STR SELF BOPASS @@ -103,6 +103,7 @@ extern jmp_buf env; %right '=' BOPASS %right '?' ':' +%left '`' %right FOP_NOT %left FOP_EQUIV %left FOP_REPL @@ -127,7 +128,13 @@ extern jmp_buf env; %% start : stat - { parse_snode = $1; YYACCEPT; } + { + parse_snode = $1; + if ( yychar >= 0 ) + fprintf(stderr, + "Warning: a token was wasted after an 'if' statement without 'else'.\n"); + YYACCEPT; + } ; stat : tail { $$ = 0; } @@ -428,5 +435,7 @@ expr : pexpr { $$ = mkfnode(1,I_NEWCOMP,(int)structtoindex($3)); } | QUOTED '(' expr ')' { MKQUOTE(quote,$3); $$ = mkfnode(1,I_FORMULA,(pointer)quote); } + | '`' expr + { MKQUOTE(quote,$2); $$ = mkfnode(1,I_FORMULA,(pointer)quote); } ; %%