===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v
retrieving revision 1.22
retrieving revision 1.26
diff -u -p -r1.22 -r1.26
--- OpenXM_contrib2/asir2000/parse/parse.y	2003/12/01 02:18:53	1.22
+++ OpenXM_contrib2/asir2000/parse/parse.y	2005/04/07 08:33:12	1.26
@@ -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.21 2003/05/30 00:47:25 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.25 2004/06/21 09:05:16 noro Exp $ 
 */
 %{
 #define malloc(x) GC_malloc(x)
@@ -89,7 +89,7 @@ extern jmp_buf env;
 	pointer p;
 }
 
-%token <i> STRUCT POINT NEWSTRUCT ANS FDEF PFDEF MODDEF MODEND 
+%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> FOP_AND FOP_OR FOP_IMPL FOP_REPL FOP_EQUIV FOP_NOT LOP
@@ -267,13 +267,7 @@ pexpr	: STR
 					if ( f )
 						$$ = mkfnode(2,I_FUNC,f,mkfnode(1,I_LIST,0));
 					else {
-						searchf(sysf,$1,&f); 
-						if ( !f )
-							searchf(ubinf,$1,&f);
-						if ( !f )
-							searchpf($1,&f);
-						if ( !f )
-							searchf(usrf,$1,&f);
+						gen_searchf_searchonly($1,(FUNC *)&f);
 						if ( f )
 							makesrvar(f,(P *)&val);
 						else
@@ -342,6 +336,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); }