===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v
retrieving revision 1.34
retrieving revision 1.38
diff -u -p -r1.34 -r1.38
--- OpenXM_contrib2/asir2000/parse/parse.y	2011/06/16 08:17:15	1.34
+++ OpenXM_contrib2/asir2000/parse/parse.y	2018/03/28 05:27:22	1.38
@@ -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.37 2017/08/31 02:36:21 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 <alloca.h>
@@ -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
@@ -286,7 +286,6 @@ pexpr	: STR
 				print_crossref(val);
 				$$ = mkfnode(2,I_FUNC,val,mkfnode(1,I_LIST,$3));
 			}
-
 		| LCASE '(' node '|' optlist ')' 
 			{
 				gen_searchf($1,(FUNC *)&val);
@@ -426,6 +425,13 @@ expr 	: pexpr
 			{ $$ = mkfnode(3,I_COP,$2,$1,$3); }
 	 	| '!' expr 	
 			{ $$ = mkfnode(1,I_NOT,$2); }
+	 	| expr '!'
+			{ 
+				gen_searchf("factorial",(FUNC *)&val);
+				print_crossref(val);
+				MKNODE(a,$1,0);
+				$$ = mkfnode(2,I_FUNC,val,mkfnode(1,I_LIST,a));
+			}
 	 	| expr OR expr
 			{ $$ = mkfnode(2,I_OR,$1,$3); }
 	 	| expr AND expr
@@ -448,6 +454,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 ')'