=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.6 retrieving revision 1.8 diff -u -p -r1.6 -r1.8 --- OpenXM_contrib2/asir2000/parse/parse.y 2001/04/20 02:34:24 1.6 +++ OpenXM_contrib2/asir2000/parse/parse.y 2001/08/21 01:39:39 1.8 @@ -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.5 2000/12/05 01:24:57 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.7 2001/08/20 09:50:35 noro Exp $ */ %{ #define malloc(x) GC_malloc(x) @@ -90,7 +90,7 @@ extern jmp_buf env; } %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 TIMER GF2NGEN GFPNGEN GETOPT +%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

'+' '-' '*' '/' '^' '%' @@ -306,6 +306,19 @@ pexpr : STR appenduf($3,(FUNC *)&val); $$ = mkfnode(2,I_MAP,val,mkfnode(1,I_LIST,$5)); } + | RECMAP '(' LCASE ',' node ')' + { + 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_RECMAP,val,mkfnode(1,I_LIST,$5)); + } | TIMER '(' expr ',' expr ',' expr ')' { $$ = mkfnode(3,I_TIMER,$3,$5,$7); @@ -326,7 +339,7 @@ pexpr : STR | CDR '(' expr ')' { $$ = mkfnode(1,I_CDR,$3); } | '(' expr ')' - { $$ = $2; } + { $$ = mkfnode(1,I_PAREN,$2); } | UCASE { if ( main_parser )