=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.10 retrieving revision 1.13 diff -u -p -r1.10 -r1.13 --- OpenXM_contrib2/asir2000/parse/parse.y 2001/09/03 07:01:10 1.10 +++ OpenXM_contrib2/asir2000/parse/parse.y 2002/12/09 00:42:15 1.13 @@ -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.9 2001/09/03 01:04:28 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.12 2001/10/03 01:47:31 noro Exp $ */ %{ #define malloc(x) GC_malloc(x) @@ -65,7 +65,7 @@ extern int gdef; extern SNODE parse_snode; -extern int main_parser; +extern int main_parser, allow_create_var; int prresult; @@ -297,6 +297,13 @@ pexpr : STR { $$ = 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); @@ -316,7 +323,7 @@ pexpr : STR { $$ = 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); @@ -357,7 +364,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