=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.4 retrieving revision 1.15 diff -u -p -r1.4 -r1.15 --- OpenXM_contrib2/asir2000/parse/parse.y 2000/09/21 09:19:27 1.4 +++ OpenXM_contrib2/asir2000/parse/parse.y 2003/05/14 06:20:12 1.15 @@ -45,32 +45,27 @@ * 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.3 2000/08/22 05:04:27 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.14 2002/12/22 02:08:29 takayama Exp $ */ %{ #define malloc(x) GC_malloc(x) #define realloc(x,y) GC_realloc(x,y) #define free(x) GC_free(x) -#if defined(THINK_C) -#define alloca(x) GC_malloc(x) -#endif #if defined(TOWNS) #include #endif #include #include "ca.h" -#if !defined(THINK_C) #include #include -#endif #include "parse.h" #define NOPR (prresult=0) -extern int gdef; +extern int gdef,mgdef; extern SNODE parse_snode; -extern int main_parser; +extern int main_parser, allow_create_var; int prresult; @@ -79,6 +74,7 @@ static FNODE t; static NODE a,b; static NODE2 a2; static pointer val; +static QUOTE quote; extern jmp_buf env; %} @@ -93,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 MODDEF GLOBAL MGLOBAL 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

'+' '-' '*' '/' '^' '%' @@ -136,6 +132,8 @@ stat : tail { $$ = 0; } | GLOBAL { gdef=1; } pvars { gdef=0; } tail { $$ = 0; } + | MGLOBAL { mgdef=1; } pvars { mgdef=0; } tail + { $$ = 0; } | STRUCT rawstr '{' members '}' tail { structdef($2,$4); $$ = 0; } | expr tail @@ -167,9 +165,14 @@ stat : tail | FDEF LCASE { mkpvs(); } '(' node ')' desc '{' stats '}' { mkuf($2,asir_infile->name,$5, - mksnode(1,S_CPLX,$9),$1,asir_infile->ln,$7); + mksnode(1,S_CPLX,$9),$1,asir_infile->ln,$7,CUR_MODULE); $$ = 0; NOPR; } + | MODDEF LCASE { CUR_MODULE = mkmodule($2); } '{' stats '}' + { + CUR_MODULE = 0; + $$ = 0; NOPR; + } | error tail { yyerrok; $$ = 0; } ; @@ -177,6 +180,7 @@ tail : ';' { if ( main_parser ) prresult = 1; } | '$' { if ( main_parser ) prresult = 0; } +; desc : { $$ = 0; } | STR @@ -233,6 +237,8 @@ pexpr : STR { $$ = mkfnode(0,I_GF2NGEN); } | GFPNGEN { $$ = mkfnode(0,I_GFPNGEN); } + | GFSNGEN + { $$ = mkfnode(0,I_GFSNGEN); } | LCASE { FUNC f; @@ -262,32 +268,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); @@ -297,23 +297,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); @@ -330,10 +328,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); @@ -374,7 +372,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 @@ -415,5 +413,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); } ; %%