=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.19 retrieving revision 1.34 diff -u -p -r1.19 -r1.34 --- OpenXM_contrib2/asir2000/parse/parse.y 2003/05/20 06:15:01 1.19 +++ OpenXM_contrib2/asir2000/parse/parse.y 2011/06/16 08:17:15 1.34 @@ -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.18 2003/05/16 09:34:50 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.33 2008/09/01 06:20:33 noro Exp $ */ %{ #define malloc(x) GC_malloc(x) @@ -67,7 +67,7 @@ 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,8 @@ extern jmp_buf env; pointer p; } -%token STRUCT POINT NEWSTRUCT ANS FDEF PFDEF MODDEF MODEND -%token GLOBAL MGLOBAL LOCAL LOCALF 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 FOP_AND FOP_OR FOP_IMPL FOP_REPL FOP_EQUIV FOP_NOT LOP %token

FORMULA UCASE LCASE STR SELF BOPASS @@ -103,6 +103,7 @@ extern jmp_buf env; %right '=' BOPASS %right '?' ':' +%left '`' %right FOP_NOT %left FOP_EQUIV %left FOP_REPL @@ -127,7 +128,13 @@ 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; } @@ -150,33 +157,37 @@ stat : tail | CONTINUE tail { $$ = mksnode(0,S_CONTINUE); } | RETURN tail - { $$ = mksnode(1,S_RETURN,0); } + { $$ = mksnode(1,S_RETURN,NULLP); } | RETURN expr tail { $$ = mksnode(1,S_RETURN,$2); } | IF '(' node ')' stat - { $$ = mksnode(4,S_IFELSE,$1,$3,$5,0); $5?$$->ln=$5->ln:0; NOPR; } + { $$ = mksnode(4,S_IFELSE,$1,$3,$5,NULLP); $5?$$->ln=$5->ln:0; NOPR; } | IF '(' node ')' stat ELSE stat { $$ = mksnode(4,S_IFELSE,$1,$3,$5,$7); $7?$$->ln=$7->ln:0; NOPR; } | FOR '(' node ';' node ';' node ')' stat { $$ = mksnode(5,S_FOR,$1,$3,$5?$5:ONENODE,$7,$9); $9?$$->ln=$9->ln:0; NOPR; } | WHILE '(' node ')' stat - { $$ = mksnode(5,S_FOR,$1,0,$3,0,$5); $5?$$->ln=$5->ln:0; NOPR; } + { $$ = mksnode(5,S_FOR,$1,NULLP,$3,NULLP,$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 ')' - { $$ = mksnode(3,S_PFDEF,$2,$4,0); NOPR; } + | PFDEF LCASE '(' node ')' tail + { $$ = mksnode(3,S_PFDEF,$2,$4,NULLP); NOPR; } | FDEF LCASE { mkpvs($2); } '(' { ldef = 1; } node { ldef = -1; } ')' desc '{' stats '}' { mkuf($2,asir_infile->name,$6, mksnode(1,S_CPLX,$11),$1,asir_infile->ln,$9,CUR_MODULE); - $$ = 0; NOPR; + $$ = 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,NULLP); NOPR; } | error tail { yyerrok; $$ = 0; } ; @@ -254,19 +265,13 @@ pexpr : STR searchf(noargsysf,$1,&f); if ( f ) - $$ = mkfnode(2,I_FUNC,f,0); + $$ = mkfnode(2,I_FUNC,f,NULLP); else { searchc($1,&f); if ( f ) - $$ = mkfnode(2,I_FUNC,f,mkfnode(1,I_LIST,0)); + $$ = mkfnode(2,I_FUNC,f,mkfnode(1,I_LIST,NULLP)); 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 @@ -304,7 +309,7 @@ pexpr : STR | LCASE '{' node '}' '(' node ')' { searchpf($1,(FUNC *)&val); - $$ = mkfnode(2,I_PFDERIV,val,mkfnode(1,I_LIST,$6),mkfnode(1,I_LIST,$3)); + $$ = mkfnode(3,I_PFDERIV,val,mkfnode(1,I_LIST,$6),mkfnode(1,I_LIST,$3)); } | GETOPT '(' rawstr ')' { @@ -312,7 +317,7 @@ pexpr : STR } | GETOPT '(' ')' { - $$ = mkfnode(2,I_GETOPT,0); + $$ = mkfnode(2,I_GETOPT,NULLP); } | TIMER '(' expr ',' expr ',' expr ')' { @@ -323,7 +328,7 @@ pexpr : STR searchf(parif,$3,(FUNC *)&val); if ( !val ) mkparif($3,(FUNC *)&val); - $$ = mkfnode(2,I_FUNC,val,0); + $$ = mkfnode(2,I_FUNC,val,NULLP); } | PARIF '(' LCASE ',' node ')' { @@ -334,8 +339,27 @@ pexpr : STR } | '(' '*' expr ')' '(' node ')' { - $$ = mkfnode(2,I_IFUNC,$3,mkfnode(1,I_LIST,$6)); + $$ = mkfnode(2,I_IFUNC,$3,mkfnode(1,I_LIST,$6),NULLP); } + | '(' '*' expr ')' '(' node '|' optlist ')' + { + $$ = mkfnode(3,I_IFUNC,$3,mkfnode(1,I_LIST,$6), + mkfnode(1,I_LIST,$8)); + } + | UCASE '(' node ')' + { + if ( main_parser || allow_create_var ) + t = mkfnode(2,I_PVAR,makepvar($1),NULLP); + else { + ind = searchpvar($1); + if ( ind == -1 ) { + fprintf(stderr,"%s : no such variable.\n",$1); + YYABORT; + } else + t = mkfnode(2,I_PVAR,ind,NULLP); + } + $$ = mkfnode(2,I_IFUNC,t,mkfnode(1,I_LIST,$3)); + } | CAR '(' expr ')' { $$ = mkfnode(1,I_CAR,$3); } | CDR '(' expr ')' @@ -345,14 +369,14 @@ pexpr : STR | UCASE { if ( main_parser || allow_create_var ) - $$ = mkfnode(2,I_PVAR,makepvar($1),0); + $$ = mkfnode(2,I_PVAR,makepvar($1),NULLP); else { ind = searchpvar($1); if ( ind == -1 ) { fprintf(stderr,"%s : no such variable.\n",$1); YYABORT; } else - $$ = mkfnode(2,I_PVAR,ind,0); + $$ = mkfnode(2,I_PVAR,ind,NULLP); } } | pexpr '[' expr ']' @@ -371,7 +395,7 @@ pexpr : STR expr : pexpr { $$ = $1; } | '(' STRUCT rawstr ')' pexpr - { $$ = mkfnode(3,I_CAST,structtoindex($3),$5,0); } + { $$ = mkfnode(3,I_CAST,structtoindex($3),$5,NULLP); } | expr '=' expr { $$ = mkfnode(2,I_ASSPVAR,$1,$3); } | expr BOPASS expr @@ -407,7 +431,7 @@ expr : pexpr | expr AND expr { $$ = mkfnode(2,I_AND,$1,$3); } | FOP_NOT expr - { $$ = mkfnode(3,I_LOP,$1,$2,0); } + { $$ = mkfnode(3,I_LOP,$1,$2,NULLP); } | expr FOP_AND expr { $$ = mkfnode(3,I_LOP,$2,$1,$3); } | expr FOP_OR expr @@ -428,5 +452,9 @@ expr : pexpr { $$ = mkfnode(1,I_NEWCOMP,(int)structtoindex($3)); } | QUOTED '(' expr ')' { MKQUOTE(quote,$3); $$ = mkfnode(1,I_FORMULA,(pointer)quote); } + | '[' node '|' expr ']' + { $$ = mkfnode(2,I_CONS,$2,$4); } + | '`' expr + { MKQUOTE(quote,$2); $$ = mkfnode(1,I_FORMULA,(pointer)quote); } ; %%