===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/parse.y,v
retrieving revision 1.4
retrieving revision 1.8
diff -u -p -r1.4 -r1.8
--- OpenXM_contrib2/asir2000/parse/parse.y	2000/09/21 09:19:27	1.4
+++ OpenXM_contrib2/asir2000/parse/parse.y	2001/08/21 01:39:39	1.8
@@ -45,25 +45,20 @@
  * 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.3 2000/08/22 05:04:27 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/parse.y,v 1.7 2001/08/20 09:50:35 noro Exp $ 
 */
 %{
 #define malloc(x) GC_malloc(x)
 #define realloc(x,y) GC_realloc(x,y)
 #define free(x) GC_free(x)
 
-#if defined(THINK_C)
-#define alloca(x) GC_malloc(x)
-#endif
 #if defined(TOWNS)
 #include <alloca.h>
 #endif
 #include <ctype.h>
 #include "ca.h"
-#if !defined(THINK_C)
 #include <sys/types.h>
 #include <sys/stat.h>
-#endif
 #include "parse.h"
 
 #define NOPR (prresult=0)
@@ -79,6 +74,7 @@ static FNODE t;
 static NODE a,b;
 static NODE2 a2;
 static pointer val;
+static QUOTE quote;
 extern jmp_buf env;
 %}
 
@@ -93,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 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> '+' '-' '*' '/' '^' '%'
@@ -310,6 +306,19 @@ pexpr	: STR
 					appenduf($3,(FUNC *)&val);
 				$$ = mkfnode(2,I_MAP,val,mkfnode(1,I_LIST,$5));
 			}
+		| RECMAP '(' LCASE ',' node ')' 
+			{
+				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_RECMAP,val,mkfnode(1,I_LIST,$5));
+			}
 		| TIMER '(' expr ',' expr ',' expr ')'
 			{
 				$$ = mkfnode(3,I_TIMER,$3,$5,$7);
@@ -330,7 +339,7 @@ pexpr	: STR
 		| CDR '(' expr ')'
 			{ $$ = mkfnode(1,I_CDR,$3); }
 		| '(' expr ')'
-			{ $$ = $2; }
+			{ $$ = mkfnode(1,I_PAREN,$2); }
 		| UCASE
 			{ 
 				if ( main_parser )
@@ -415,5 +424,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); }
 	 	;
 %%