=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.5 retrieving revision 1.10 diff -u -p -r1.5 -r1.10 --- OpenXM_contrib2/asir2000/parse/parse.y 2000/12/05 01:24:57 1.5 +++ OpenXM_contrib2/asir2000/parse/parse.y 2001/09/03 07:01:10 1.10 @@ -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.4 2000/09/21 09:19:27 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.9 2001/09/03 01:04:28 noro Exp $ */ %{ #define malloc(x) GC_malloc(x) @@ -74,6 +74,7 @@ static FNODE t; static NODE a,b; static NODE2 a2; static pointer val; +static QUOTE quote; extern jmp_buf env; %} @@ -88,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 GFSNGEN GETOPT %token FOP_AND FOP_OR FOP_IMPL FOP_REPL FOP_EQUIV FOP_NOT LOP %token

FORMULA UCASE LCASE STR SELF BOPASS %token

'+' '-' '*' '/' '^' '%' @@ -228,6 +229,8 @@ pexpr : STR { $$ = mkfnode(0,I_GF2NGEN); } | GFPNGEN { $$ = mkfnode(0,I_GFPNGEN); } + | GFSNGEN + { $$ = mkfnode(0,I_GFSNGEN); } | LCASE { FUNC f; @@ -257,32 +260,26 @@ pexpr : STR } | LCASE '(' node ')' { - searchf(sysf,$1,(FUNC *)&val); - if ( !val ) - searchf(ubinf,$1,(FUNC *)&val); - if ( !val ) - searchpf($1,(FUNC *)&val); - if ( !val ) - searchf(usrf,$1,(FUNC *)&val); - if ( !val ) - appenduf($1,(FUNC *)&val); + gen_searchf($1,(FUNC *)&val); $$ = mkfnode(2,I_FUNC,val,mkfnode(1,I_LIST,$3)); } | LCASE '(' node '|' optlist ')' { - searchf(sysf,$1,(FUNC *)&val); - if ( !val ) - searchf(ubinf,$1,(FUNC *)&val); - if ( !val ) - searchpf($1,(FUNC *)&val); - if ( !val ) - searchf(usrf,$1,(FUNC *)&val); - if ( !val ) - appenduf($1,(FUNC *)&val); + gen_searchf($1,(FUNC *)&val); $$ = mkfnode(3,I_FUNC_OPT,val, mkfnode(1,I_LIST,$3),mkfnode(1,I_LIST,$5)); } + | MAP '(' LCASE ',' node ')' + { + gen_searchf($3,(FUNC *)&val); + $$ = mkfnode(2,I_MAP,val,mkfnode(1,I_LIST,$5)); + } + | RECMAP '(' LCASE ',' node ')' + { + gen_searchf($3,(FUNC *)&val); + $$ = mkfnode(2,I_RECMAP,val,mkfnode(1,I_LIST,$5)); + } | LCASE '{' node '}' '(' node ')' { searchpf($1,(FUNC *)&val); @@ -292,18 +289,9 @@ pexpr : STR { $$ = mkfnode(2,I_GETOPT,$3); } - | MAP '(' LCASE ',' node ')' + | GETOPT '(' ')' { - 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_MAP,val,mkfnode(1,I_LIST,$5)); + $$ = mkfnode(2,I_GETOPT,0); } | TIMER '(' expr ',' expr ',' expr ')' { @@ -325,7 +313,7 @@ pexpr : STR | CDR '(' expr ')' { $$ = mkfnode(1,I_CDR,$3); } | '(' expr ')' - { $$ = $2; } + { $$ = mkfnode(1,I_PAREN,$2); } | UCASE { if ( main_parser ) @@ -410,5 +398,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); } ; %%