=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.5 retrieving revision 1.22 diff -u -p -r1.5 -r1.22 --- OpenXM_contrib2/asir2000/parse/parse.y 2000/12/05 01:24:57 1.5 +++ 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.4 2000/09/21 09:19:27 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) @@ -63,9 +63,9 @@ #define NOPR (prresult=0) -extern int gdef; +extern int gdef,mgdef,ldef; extern SNODE parse_snode; -extern int main_parser; +extern int main_parser, allow_create_var; int prresult; @@ -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,9 @@ 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 MODDEF MODEND +%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 %token

'+' '-' '*' '/' '^' '%' @@ -97,10 +99,11 @@ extern jmp_buf env; %type

desc rawstr %type expr pexpr opt %type stat complex -%type stats node _node pvars members optlist +%type stats node _node pvars vars members optlist %right '=' BOPASS %right '?' ':' +%left '`' %right FOP_NOT %left FOP_EQUIV %left FOP_REPL @@ -125,14 +128,26 @@ 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; } | GLOBAL { gdef=1; } pvars { gdef=0; } tail - { $$ = 0; } + { $$ = 0; NOPR; } + | MGLOBAL { mgdef=1; } pvars { mgdef=0; } tail + { $$ = 0; NOPR; } + | LOCAL { ldef=1; } pvars { ldef=0; } tail + { $$ = 0; NOPR; } + | LOCALF vars tail + { appenduflist($2); $$ = 0; NOPR; } | STRUCT rawstr '{' members '}' tail - { structdef($2,$4); $$ = 0; } + { structdef($2,$4); $$ = 0; NOPR; } | expr tail { $$ = mksnode(1,S_SINGLE,$1); } | complex @@ -157,14 +172,18 @@ stat : tail { $$ = mksnode(3,S_DO,$1,$2,$5); } | LCASE '(' node ')' ':' '=' expr tail { $$ = mksnode(3,S_PFDEF,$1,$3,$7); NOPR; } - | PFDEF LCASE '(' node ')' + | PFDEF LCASE '(' node ')' tail { $$ = mksnode(3,S_PFDEF,$2,$4,0); NOPR; } - | FDEF LCASE { mkpvs(); } '(' node ')' desc '{' stats '}' + | FDEF LCASE { mkpvs($2); } '(' { ldef = 1; } node { ldef = -1; } ')' desc '{' stats '}' { - mkuf($2,asir_infile->name,$5, - mksnode(1,S_CPLX,$9),$1,asir_infile->ln,$7); + mkuf($2,asir_infile->name,$6, + mksnode(1,S_CPLX,$11),$1,asir_infile->ln,$9,CUR_MODULE); $$ = 0; NOPR; } + | MODDEF LCASE tail + { CUR_MODULE = mkmodule($2); MPVS = CUR_MODULE->pvs; $$ = 0; NOPR; } + | MODEND tail + { CUR_MODULE = 0; MPVS = 0; $$ = 0; NOPR; } | error tail { yyerrok; $$ = 0; } ; @@ -172,6 +191,7 @@ tail : ';' { if ( main_parser ) prresult = 1; } | '$' { if ( main_parser ) prresult = 0; } +; desc : { $$ = 0; } | STR @@ -185,6 +205,11 @@ members : rawstr | members ',' rawstr { appendtonode($1,$3,&$$); } ; +vars : LCASE + { MKNODE($$,$1,0); } + | vars ',' LCASE + { appendtonode($1,$3,&$$); } + ; pvars : UCASE { val = (pointer)makepvar($1); MKNODE($$,val,0); } | pvars ',' UCASE @@ -228,6 +253,8 @@ pexpr : STR { $$ = mkfnode(0,I_GF2NGEN); } | GFPNGEN { $$ = mkfnode(0,I_GFPNGEN); } + | GFSNGEN + { $$ = mkfnode(0,I_GFSNGEN); } | LCASE { FUNC f; @@ -257,32 +284,30 @@ 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); + print_crossref(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); + print_crossref(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); + print_crossref(val); + $$ = mkfnode(2,I_MAP,val,mkfnode(1,I_LIST,$5)); + } + | RECMAP '(' LCASE ',' node ')' + { + gen_searchf($3,(FUNC *)&val); + print_crossref(val); + $$ = mkfnode(2,I_RECMAP,val,mkfnode(1,I_LIST,$5)); + } | LCASE '{' node '}' '(' node ')' { searchpf($1,(FUNC *)&val); @@ -292,23 +317,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); } | 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); @@ -325,10 +348,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); @@ -369,7 +392,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 @@ -410,5 +433,9 @@ 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); } + | '`' expr + { MKQUOTE(quote,$2); $$ = mkfnode(1,I_FORMULA,(pointer)quote); } ; %%