===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v
retrieving revision 1.24
retrieving revision 1.29
diff -u -p -r1.24 -r1.29
--- OpenXM_contrib2/asir2000/parse/parse.y	2004/06/18 05:57:00	1.24
+++ OpenXM_contrib2/asir2000/parse/parse.y	2005/09/13 06:40:46	1.29
@@ -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.23 2004/02/05 08:28:54 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.28 2005/08/24 06:28:39 noro Exp $ 
 */
 %{
 #define malloc(x) GC_malloc(x)
@@ -67,7 +67,7 @@ extern int gdef,mgdef,ldef;
 extern SNODE parse_snode;
 extern int main_parser, allow_create_var;
 
-int prresult;
+int prresult,saveresult;
 
 static int ind;
 static FNODE t;
@@ -92,6 +92,7 @@ extern jmp_buf env;
 %token <i> STRUCT POINT NEWSTRUCT ANS FDEF PFDEF MODDEF MODEND
 %token <i> GLOBAL MGLOBAL LOCAL LOCALF CMP OR AND CAR CDR QUOTED COLONCOLON
 %token <i> DO WHILE FOR IF ELSE BREAK RETURN CONTINUE PARIF MAP RECMAP TIMER GF2NGEN GFPNGEN GFSNGEN GETOPT
+%token <i> UNIFY
 %token <i> FOP_AND FOP_OR FOP_IMPL FOP_REPL FOP_EQUIV FOP_NOT LOP
 %token <p> FORMULA UCASE LCASE STR SELF BOPASS
 %token <p> '+' '-' '*' '/' '^' '%'
@@ -169,7 +170,7 @@ stat 	: tail
 		| WHILE '(' node ')' stat
 			{ $$ = mksnode(5,S_FOR,$1,0,$3,0,$5); $5?$$->ln=$5->ln:0; NOPR; }
 		| DO stat WHILE '(' node ')' tail
-			{ $$ = mksnode(3,S_DO,$1,$2,$5); }
+			{ $$ = mksnode(3,S_DO,$1,$2,$5); NOPR; }
 		| LCASE '(' node ')' ':' '=' expr tail
 			{ $$ = mksnode(3,S_PFDEF,$1,$3,$7); NOPR; }
 		| PFDEF LCASE '(' node ')' tail
@@ -178,12 +179,16 @@ stat 	: tail
 			{
 				mkuf($2,asir_infile->name,$6,
 					mksnode(1,S_CPLX,$11),$1,asir_infile->ln,$9,CUR_MODULE); 
-				$$ = 0; NOPR; 
+				$$ = 0; NOPR;
 			}
 		| MODDEF LCASE tail
-			{ CUR_MODULE = mkmodule($2); MPVS = CUR_MODULE->pvs; $$ = 0; NOPR; }
+			{ 
+				CUR_MODULE = mkmodule($2);
+				MPVS = CUR_MODULE->pvs; 
+				$$ = mksnode(1,S_MODULE,CUR_MODULE); NOPR;
+			}
 		| MODEND tail
-			{ CUR_MODULE = 0; MPVS = 0; $$ = 0; NOPR; }
+			{ CUR_MODULE = 0; MPVS = 0; $$ = mksnode(1,S_MODULE,0); NOPR; }
 	  	| error tail
 			{ yyerrok; $$ = 0; }
 		;
@@ -267,7 +272,7 @@ pexpr	: STR
 					if ( f )
 						$$ = mkfnode(2,I_FUNC,f,mkfnode(1,I_LIST,0));
 					else {
-						gen_searchf($1,(FUNC *)&f);
+						gen_searchf_searchonly($1,(FUNC *)&f);
 						if ( f )
 							makesrvar(f,(P *)&val);
 						else
@@ -302,6 +307,10 @@ pexpr	: STR
 				print_crossref(val);
 				$$ = mkfnode(2,I_RECMAP,val,mkfnode(1,I_LIST,$5));
 			}
+		| UNIFY '(' expr ',' expr ')' 
+			{
+				$$ = mkfnode(2,I_UNIFY,$3,$5);
+			}
 		| LCASE '{' node '}' '(' node ')' 
 			{
 				searchpf($1,(FUNC *)&val);
@@ -336,6 +345,20 @@ pexpr	: STR
 		| '('  '*' expr ')' '(' node ')'
 			{
 				$$ = mkfnode(2,I_IFUNC,$3,mkfnode(1,I_LIST,$6));
+			}	
+		| UCASE '(' node ')'
+			{
+				if ( main_parser || allow_create_var )
+					t = mkfnode(2,I_PVAR,makepvar($1),0);
+				else {
+					ind = searchpvar($1);
+					if ( ind == -1 ) {
+						fprintf(stderr,"%s : no such variable.\n",$1);
+						YYABORT;
+					} else
+						t = mkfnode(2,I_PVAR,ind,0);
+				}
+				$$ = mkfnode(2,I_IFUNC,t,mkfnode(1,I_LIST,$3));
 			}	
 		| CAR '(' expr ')'
 			{ $$ = mkfnode(1,I_CAR,$3); }