===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v
retrieving revision 1.24
retrieving revision 1.27
diff -u -p -r1.24 -r1.27
--- OpenXM_contrib2/asir2000/parse/parse.y	2004/06/18 05:57:00	1.24
+++ OpenXM_contrib2/asir2000/parse/parse.y	2005/07/27 04:35:11	1.27
@@ -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.26 2005/04/07 08:33:12 noro Exp $ 
 */
 %{
 #define malloc(x) GC_malloc(x)
@@ -181,9 +181,13 @@ stat 	: tail
 				$$ = 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 +271,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
@@ -336,6 +340,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); }