=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.4 retrieving revision 1.7 diff -u -p -r1.4 -r1.7 --- OpenXM_contrib2/asir2000/parse/parse.y 2000/09/21 09:19:27 1.4 +++ OpenXM_contrib2/asir2000/parse/parse.y 2001/08/20 09:50:35 1.7 @@ -45,25 +45,20 @@ * 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.3 2000/08/22 05:04:27 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.6 2001/04/20 02:34:24 noro Exp $ */ %{ #define malloc(x) GC_malloc(x) #define realloc(x,y) GC_realloc(x,y) #define free(x) GC_free(x) -#if defined(THINK_C) -#define alloca(x) GC_malloc(x) -#endif #if defined(TOWNS) #include #endif #include #include "ca.h" -#if !defined(THINK_C) #include #include -#endif #include "parse.h" #define NOPR (prresult=0) @@ -79,6 +74,7 @@ static FNODE t; static NODE a,b; static NODE2 a2; static pointer val; +static QUOTE quote; extern jmp_buf env; %} @@ -93,8 +89,8 @@ extern jmp_buf env; pointer p; } -%token STRUCT POINT NEWSTRUCT ANS FDEF PFDEF GLOBAL CMP OR AND CAR CDR -%token DO WHILE FOR IF ELSE BREAK RETURN CONTINUE PARIF MAP TIMER GF2NGEN GFPNGEN GETOPT +%token STRUCT POINT NEWSTRUCT ANS FDEF PFDEF GLOBAL CMP OR AND CAR CDR QUOTED +%token DO WHILE FOR IF ELSE BREAK RETURN CONTINUE PARIF MAP RECMAP TIMER GF2NGEN GFPNGEN GETOPT %token FOP_AND FOP_OR FOP_IMPL FOP_REPL FOP_EQUIV FOP_NOT LOP %token

FORMULA UCASE LCASE STR SELF BOPASS %token

'+' '-' '*' '/' '^' '%' @@ -310,6 +306,19 @@ pexpr : STR appenduf($3,(FUNC *)&val); $$ = mkfnode(2,I_MAP,val,mkfnode(1,I_LIST,$5)); } + | RECMAP '(' LCASE ',' node ')' + { + searchf(sysf,$3,(FUNC *)&val); + if ( !val ) + searchf(ubinf,$3,(FUNC *)&val); + if ( !val ) + searchpf($3,(FUNC *)&val); + if ( !val ) + searchf(usrf,$3,(FUNC *)&val); + if ( !val ) + appenduf($3,(FUNC *)&val); + $$ = mkfnode(2,I_RECMAP,val,mkfnode(1,I_LIST,$5)); + } | TIMER '(' expr ',' expr ',' expr ')' { $$ = mkfnode(3,I_TIMER,$3,$5,$7); @@ -415,5 +424,7 @@ expr : pexpr { $$ = mkfnode(1,I_EV,$2); } | NEWSTRUCT '(' rawstr ')' { $$ = mkfnode(1,I_NEWCOMP,(int)structtoindex($3)); } + | QUOTED '(' expr ')' + { MKQUOTE(quote,$3); $$ = mkfnode(1,I_FORMULA,(pointer)quote); } ; %%