===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v
retrieving revision 1.5
retrieving revision 1.14
diff -u -p -r1.5 -r1.14
--- OpenXM_contrib2/asir2000/parse/parse.y	2000/12/05 01:24:57	1.5
+++ OpenXM_contrib2/asir2000/parse/parse.y	2002/12/22 02:08:29	1.14
@@ -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.4 2000/09/21 09:19:27 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.13 2002/12/09 00:42:15 noro Exp $ 
 */
 %{
 #define malloc(x) GC_malloc(x)
@@ -65,7 +65,7 @@
 
 extern int gdef;
 extern SNODE parse_snode;
-extern int main_parser;
+extern int main_parser, allow_create_var;
 
 int prresult;
 
@@ -74,6 +74,7 @@ static FNODE t;
 static NODE a,b;
 static NODE2 a2;
 static pointer val;
+static QUOTE quote;
 extern jmp_buf env;
 %}
 
@@ -88,8 +89,8 @@ extern jmp_buf env;
 	pointer p;
 }
 
-%token <i> STRUCT POINT NEWSTRUCT ANS FDEF PFDEF GLOBAL CMP OR AND CAR CDR
-%token <i> DO WHILE FOR IF ELSE BREAK RETURN CONTINUE PARIF MAP TIMER GF2NGEN GFPNGEN GETOPT
+%token <i> STRUCT POINT NEWSTRUCT ANS FDEF PFDEF GLOBAL CMP OR AND CAR CDR QUOTED
+%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
 %token <p> '+' '-' '*' '/' '^' '%'
@@ -172,6 +173,7 @@ tail	: ';' 
 			{ if ( main_parser ) prresult = 1; } 
 		| '$' 
 			{ if ( main_parser ) prresult = 0; } 
+;
 desc	:
 			{ $$ = 0; }
 		| STR
@@ -228,6 +230,8 @@ pexpr	: STR
 			{ $$ = mkfnode(0,I_GF2NGEN); }
 		| GFPNGEN
 			{ $$ = mkfnode(0,I_GFPNGEN); }
+		| GFSNGEN
+			{ $$ = mkfnode(0,I_GFSNGEN); }
 	 	| LCASE
 			{
 				FUNC f;
@@ -257,32 +261,26 @@ pexpr	: STR
 			}
 		| LCASE '(' node ')' 
 			{
-				searchf(sysf,$1,(FUNC *)&val); 
-				if ( !val )
-					searchf(ubinf,$1,(FUNC *)&val);
-				if ( !val )
-					searchpf($1,(FUNC *)&val);
-				if ( !val )
-					searchf(usrf,$1,(FUNC *)&val);
-				if ( !val )
-					appenduf($1,(FUNC *)&val);
+				gen_searchf($1,(FUNC *)&val);
 				$$ = mkfnode(2,I_FUNC,val,mkfnode(1,I_LIST,$3));
 			}
 
 		| LCASE '(' node '|' optlist ')' 
 			{
-				searchf(sysf,$1,(FUNC *)&val); 
-				if ( !val )
-					searchf(ubinf,$1,(FUNC *)&val);
-				if ( !val )
-					searchpf($1,(FUNC *)&val);
-				if ( !val )
-					searchf(usrf,$1,(FUNC *)&val);
-				if ( !val )
-					appenduf($1,(FUNC *)&val);
+				gen_searchf($1,(FUNC *)&val);
 				$$ = mkfnode(3,I_FUNC_OPT,val,
 					mkfnode(1,I_LIST,$3),mkfnode(1,I_LIST,$5));
 			}
+		| MAP '(' LCASE ',' node ')' 
+			{
+				gen_searchf($3,(FUNC *)&val);
+				$$ = mkfnode(2,I_MAP,val,mkfnode(1,I_LIST,$5));
+			}
+		| RECMAP '(' LCASE ',' node ')' 
+			{
+				gen_searchf($3,(FUNC *)&val);
+				$$ = mkfnode(2,I_RECMAP,val,mkfnode(1,I_LIST,$5));
+			}
 		| LCASE '{' node '}' '(' node ')' 
 			{
 				searchpf($1,(FUNC *)&val);
@@ -292,23 +290,21 @@ pexpr	: STR
 			{
 				$$ = mkfnode(2,I_GETOPT,$3);
 			}
-		| MAP '(' LCASE ',' node ')' 
+		| GETOPT '(' ')'
 			{
-				searchf(sysf,$3,(FUNC *)&val); 
-				if ( !val )
-					searchf(ubinf,$3,(FUNC *)&val);
-				if ( !val )
-					searchpf($3,(FUNC *)&val);
-				if ( !val )
-					searchf(usrf,$3,(FUNC *)&val);
-				if ( !val )
-					appenduf($3,(FUNC *)&val);
-				$$ = mkfnode(2,I_MAP,val,mkfnode(1,I_LIST,$5));
+				$$ = mkfnode(2,I_GETOPT,0);
 			}
 		| TIMER '(' expr ',' expr ',' expr ')'
 			{
 				$$ = mkfnode(3,I_TIMER,$3,$5,$7);
 			}
+		| PARIF '(' LCASE ')'
+			{
+				searchf(parif,$3,(FUNC *)&val);
+				if ( !val )
+					mkparif($3,(FUNC *)&val);
+				$$ = mkfnode(2,I_FUNC,val,0);
+			}
 		| PARIF '(' LCASE ',' node ')'
 			{
 				searchf(parif,$3,(FUNC *)&val);
@@ -325,10 +321,10 @@ pexpr	: STR
 		| CDR '(' expr ')'
 			{ $$ = mkfnode(1,I_CDR,$3); }
 		| '(' expr ')'
-			{ $$ = $2; }
+			{ $$ = mkfnode(1,I_PAREN,$2); }
 		| UCASE
 			{ 
-				if ( main_parser )
+				if ( main_parser || allow_create_var )
 					$$ = mkfnode(2,I_PVAR,makepvar($1),0);
 				else {
 					ind = searchpvar($1);
@@ -369,7 +365,7 @@ expr 	: pexpr
 	 	| '+' expr 	%prec PLUS
 			{ $$ = $2; }
 	 	| '-' expr 	%prec MINUS
-			{ $$ = mkfnode(3,I_BOP,$1,0,$2); }
+			{ $$ = mkfnode(1,I_MINUS,$2); }
 	 	| expr '+' expr
 			{ $$ = mkfnode(3,I_BOP,$2,$1,$3); }
 	 	| expr '-' expr
@@ -410,5 +406,7 @@ expr 	: pexpr
 			{ $$ = mkfnode(1,I_EV,$2); }
 		| NEWSTRUCT '(' rawstr ')'
 			{ $$ = mkfnode(1,I_NEWCOMP,(int)structtoindex($3)); }
+		| QUOTED '(' expr ')'
+			{ MKQUOTE(quote,$3); $$ = mkfnode(1,I_FORMULA,(pointer)quote); }
 	 	;
 %%