===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v
retrieving revision 1.19
retrieving revision 1.25
diff -u -p -r1.19 -r1.25
--- OpenXM_contrib2/asir2000/parse/parse.y	2003/05/20 06:15:01	1.19
+++ OpenXM_contrib2/asir2000/parse/parse.y	2004/06/21 09:05:16	1.25
@@ -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.18 2003/05/16 09:34:50 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.24 2004/06/18 05:57:00 noro Exp $ 
 */
 %{
 #define malloc(x) GC_malloc(x)
@@ -89,8 +89,8 @@ extern jmp_buf env;
 	pointer p;
 }
 
-%token <i> STRUCT POINT NEWSTRUCT ANS FDEF PFDEF MODDEF MODEND 
-%token <i> GLOBAL MGLOBAL LOCAL LOCALF CMP OR AND CAR CDR QUOTED
+%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
 %token <p> FORMULA UCASE LCASE STR SELF BOPASS
@@ -103,6 +103,7 @@ extern jmp_buf env;
 
 %right '=' BOPASS
 %right '?' ':'
+%left '`'
 %right FOP_NOT
 %left FOP_EQUIV
 %left FOP_REPL
@@ -127,7 +128,13 @@ extern jmp_buf env;
 %%
 
 start 	: stat
-			{ parse_snode = $1; YYACCEPT; }
+			{ 
+				parse_snode = $1; 
+				if ( yychar >= 0 ) 
+					fprintf(stderr,
+						"Warning: a token was wasted after an 'if' statement without 'else'.\n");
+				YYACCEPT; 
+			}
 	  	;
 stat 	: tail
 			{ $$ = 0; }
@@ -165,7 +172,7 @@ stat 	: tail
 			{ $$ = mksnode(3,S_DO,$1,$2,$5); }
 		| LCASE '(' node ')' ':' '=' expr tail
 			{ $$ = mksnode(3,S_PFDEF,$1,$3,$7); NOPR; }
-		| PFDEF LCASE '(' node ')'
+		| PFDEF LCASE '(' node ')' tail
 			{ $$ = mksnode(3,S_PFDEF,$2,$4,0); NOPR; }
 		| FDEF LCASE { mkpvs($2); } '(' { ldef = 1; } node { ldef = -1; } ')' desc '{' stats '}'
 			{
@@ -260,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
@@ -428,5 +429,7 @@ expr 	: pexpr
 			{ $$ = mkfnode(1,I_NEWCOMP,(int)structtoindex($3)); }
 		| QUOTED '(' expr ')'
 			{ MKQUOTE(quote,$3); $$ = mkfnode(1,I_FORMULA,(pointer)quote); }
+		| '`' expr
+			{ MKQUOTE(quote,$2); $$ = mkfnode(1,I_FORMULA,(pointer)quote); }
 	 	;
 %%