=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.3 retrieving revision 1.9 diff -u -p -r1.3 -r1.9 --- OpenXM_contrib2/asir2000/parse/parse.y 2000/08/22 05:04:27 1.3 +++ OpenXM_contrib2/asir2000/parse/parse.y 2001/09/03 01:04:28 1.9 @@ -45,25 +45,20 @@ * 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.2 2000/08/21 08:31:47 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.8 2001/08/21 01:39:39 noro 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) @@ -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 GLOBAL CMP OR AND CAR CDR QUOTED +%token DO WHILE FOR IF ELSE BREAK RETURN CONTINUE PARIF MAP RECMAP TIMER GF2NGEN GFPNGEN GETOPT %token FOP_AND FOP_OR FOP_IMPL FOP_REPL FOP_EQUIV FOP_NOT LOP %token

FORMULA UCASE LCASE STR SELF BOPASS %token

'+' '-' '*' '/' '^' '%' @@ -102,7 +98,7 @@ extern jmp_buf env; %type

desc rawstr %type expr pexpr opt %type stat complex -%type stats node _node pvars fields members optlist +%type stats node _node pvars members optlist %right '=' BOPASS %right '?' ':' @@ -136,12 +132,8 @@ stat : tail { $$ = 0; } | GLOBAL { gdef=1; } pvars { gdef=0; } tail { $$ = 0; } - | STRUCT rawstr '{' fields '}' tail + | STRUCT rawstr '{' members '}' tail { structdef($2,$4); $$ = 0; } - | STRUCT rawstr '{' fields '}' pvars tail - { structdef($2,$4); setstruct($2,$6); $$ = 0; } - | STRUCT rawstr pvars tail - { setstruct($2,$3); $$ = 0; } | expr tail { $$ = mksnode(1,S_SINGLE,$1); } | complex @@ -189,13 +181,6 @@ desc : complex : '{' stats '}' { $$ = mksnode(1,S_CPLX,$2); } ; -fields : - { $$ = 0; } - | fields members tail - { MKNODE(a,0,$2); appendtonode($1,(pointer)a,&$$); } - | fields STRUCT rawstr members tail - { MKNODE(a,$3,$4); appendtonode($1,(pointer)a,&$$); } - ; members : rawstr { MKNODE($$,$1,0); } | members ',' rawstr @@ -273,32 +258,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); @@ -308,18 +287,9 @@ 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 ')' { @@ -341,7 +311,7 @@ pexpr : STR | CDR '(' expr ')' { $$ = mkfnode(1,I_CDR,$3); } | '(' expr ')' - { $$ = $2; } + { $$ = mkfnode(1,I_PAREN,$2); } | UCASE { if ( main_parser ) @@ -366,7 +336,7 @@ pexpr : STR } } | pexpr POINT rawstr - { memberofstruct($1,$3,&$$); } + { $$ = mkfnode(2,I_POINT,$1,$3); } ; expr : pexpr { $$ = $1; } @@ -426,5 +396,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); } ; %%