=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.16 retrieving revision 1.29 diff -u -p -r1.16 -r1.29 --- OpenXM_contrib2/asir2000/parse/parse.y 2003/05/14 09:18:38 1.16 +++ OpenXM_contrib2/asir2000/parse/parse.y 2005/09/13 06:40:46 1.29 @@ -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.15 2003/05/14 06:20:12 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.28 2005/08/24 06:28:39 noro Exp $ */ %{ #define malloc(x) GC_malloc(x) @@ -63,11 +63,11 @@ #define NOPR (prresult=0) -extern int gdef,mgdef; +extern int gdef,mgdef,ldef; extern SNODE parse_snode; extern int main_parser, allow_create_var; -int prresult; +int prresult,saveresult; static int ind; static FNODE t; @@ -89,8 +89,10 @@ extern jmp_buf env; pointer p; } -%token STRUCT POINT NEWSTRUCT ANS FDEF PFDEF MODDEF MODEND GLOBAL MGLOBAL CMP OR AND CAR CDR QUOTED +%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 UNIFY %token FOP_AND FOP_OR FOP_IMPL FOP_REPL FOP_EQUIV FOP_NOT LOP %token

FORMULA UCASE LCASE STR SELF BOPASS %token

'+' '-' '*' '/' '^' '%' @@ -98,10 +100,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 @@ -126,16 +129,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; } + { $$ = 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,21 +170,25 @@ stat : tail | WHILE '(' node ')' stat { $$ = mksnode(5,S_FOR,$1,0,$3,0,$5); $5?$$->ln=$5->ln:0; NOPR; } | DO stat WHILE '(' node ')' tail - { $$ = mksnode(3,S_DO,$1,$2,$5); } + { $$ = mksnode(3,S_DO,$1,$2,$5); NOPR; } | 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,CUR_MODULE); - $$ = 0; NOPR; + 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; } + { + CUR_MODULE = mkmodule($2); + MPVS = CUR_MODULE->pvs; + $$ = mksnode(1,S_MODULE,CUR_MODULE); NOPR; + } | MODEND tail - { CUR_MODULE = 0; MPVS = 0; $$ = 0; NOPR; } + { CUR_MODULE = 0; MPVS = 0; $$ = mksnode(1,S_MODULE,0); NOPR; } | error tail { yyerrok; $$ = 0; } ; @@ -193,6 +210,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 @@ -250,13 +272,7 @@ pexpr : STR if ( f ) $$ = mkfnode(2,I_FUNC,f,mkfnode(1,I_LIST,0)); else { - searchf(sysf,$1,&f); - if ( !f ) - searchf(ubinf,$1,&f); - if ( !f ) - searchpf($1,&f); - if ( !f ) - searchf(usrf,$1,&f); + gen_searchf_searchonly($1,(FUNC *)&f); if ( f ) makesrvar(f,(P *)&val); else @@ -268,25 +284,33 @@ pexpr : STR | LCASE '(' node ')' { gen_searchf($1,(FUNC *)&val); + print_crossref(val); $$ = mkfnode(2,I_FUNC,val,mkfnode(1,I_LIST,$3)); } | LCASE '(' node '|' optlist ')' { 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)); } + | UNIFY '(' expr ',' expr ')' + { + $$ = mkfnode(2,I_UNIFY,$3,$5); + } | LCASE '{' node '}' '(' node ')' { searchpf($1,(FUNC *)&val); @@ -322,6 +346,20 @@ pexpr : STR { $$ = mkfnode(2,I_IFUNC,$3,mkfnode(1,I_LIST,$6)); } + | UCASE '(' node ')' + { + if ( main_parser || allow_create_var ) + t = mkfnode(2,I_PVAR,makepvar($1),0); + else { + ind = searchpvar($1); + if ( ind == -1 ) { + fprintf(stderr,"%s : no such variable.\n",$1); + YYABORT; + } else + t = mkfnode(2,I_PVAR,ind,0); + } + $$ = mkfnode(2,I_IFUNC,t,mkfnode(1,I_LIST,$3)); + } | CAR '(' expr ')' { $$ = mkfnode(1,I_CAR,$3); } | CDR '(' expr ')' @@ -414,5 +452,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); } ; %%