=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.7 retrieving revision 1.13 diff -u -p -r1.7 -r1.13 --- OpenXM_contrib2/asir2000/parse/parse.y 2001/08/20 09:50:35 1.7 +++ OpenXM_contrib2/asir2000/parse/parse.y 2002/12/09 00:42:15 1.13 @@ -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.6 2001/04/20 02:34:24 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.12 2001/10/03 01:47:31 noro Exp $ */ %{ #define malloc(x) GC_malloc(x) @@ -65,7 +65,7 @@ extern int gdef; extern SNODE parse_snode; -extern int main_parser; +extern int main_parser, allow_create_var; int prresult; @@ -90,7 +90,7 @@ extern jmp_buf env; } %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 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

'+' '-' '*' '/' '^' '%' @@ -229,6 +229,8 @@ pexpr : STR { $$ = mkfnode(0,I_GF2NGEN); } | GFPNGEN { $$ = mkfnode(0,I_GFPNGEN); } + | GFSNGEN + { $$ = mkfnode(0,I_GFSNGEN); } | LCASE { FUNC f; @@ -258,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); @@ -293,36 +289,21 @@ 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); } - | 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); } + | PARIF '(' LCASE ')' + { + searchf(parif,$3,(FUNC *)&val); + if ( !val ) + mkparif($3,(FUNC *)&val); + $$ = mkfnode(2,I_FUNC,val,0); + } | PARIF '(' LCASE ',' node ')' { searchf(parif,$3,(FUNC *)&val); @@ -339,10 +320,10 @@ pexpr : STR | CDR '(' expr ')' { $$ = mkfnode(1,I_CDR,$3); } | '(' expr ')' - { $$ = $2; } + { $$ = mkfnode(1,I_PAREN,$2); } | UCASE { - if ( main_parser ) + if ( main_parser || allow_create_var ) $$ = mkfnode(2,I_PVAR,makepvar($1),0); else { ind = searchpvar($1); @@ -383,7 +364,7 @@ expr : pexpr | '+' expr %prec PLUS { $$ = $2; } | '-' expr %prec MINUS - { $$ = mkfnode(3,I_BOP,$1,0,$2); } + { $$ = mkfnode(1,I_MINUS,$2); } | expr '+' expr { $$ = mkfnode(3,I_BOP,$2,$1,$3); } | expr '-' expr