=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v retrieving revision 1.34 retrieving revision 1.37 diff -u -p -r1.34 -r1.37 --- OpenXM_contrib2/asir2000/parse/parse.y 2011/06/16 08:17:15 1.34 +++ OpenXM_contrib2/asir2000/parse/parse.y 2017/08/31 02:36:21 1.37 @@ -45,12 +45,12 @@ * 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.33 2008/09/01 06:20:33 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.36 2014/08/09 06:08:11 noro Exp $ */ %{ -#define malloc(x) GC_malloc(x) -#define realloc(x,y) GC_realloc(x,y) -#define free(x) GC_free(x) +#define malloc(x) Risa_GC_malloc(x) +#define realloc(x,y) Risa_GC_realloc(x,y) +#define free(x) Risa_GC_free(x) #if defined(TOWNS) #include @@ -271,7 +271,7 @@ pexpr : STR if ( f ) $$ = mkfnode(2,I_FUNC,f,mkfnode(1,I_LIST,NULLP)); else { - gen_searchf_searchonly($1,(FUNC *)&f); + gen_searchf_searchonly($1,(FUNC *)&f,1); if ( f ) makesrvar(f,(P *)&val); else @@ -448,6 +448,10 @@ expr : pexpr { $$ = mkfnode(3,I_CE,$1,$3,$5); } | '<' node '>' { $$ = mkfnode(1,I_EV,$2); } + | '<' node ':' expr '>' + { + $$ = mkfnode(2,I_EVM,$2,$4); + } | NEWSTRUCT '(' rawstr ')' { $$ = mkfnode(1,I_NEWCOMP,(int)structtoindex($3)); } | QUOTED '(' expr ')'