===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/quote.c,v
retrieving revision 1.15
retrieving revision 1.18
diff -u -p -r1.15 -r1.18
--- OpenXM_contrib2/asir2000/parse/quote.c	2004/07/08 02:58:19	1.15
+++ OpenXM_contrib2/asir2000/parse/quote.c	2004/07/13 09:10:39	1.18
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.14 2004/07/07 07:40:19 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.17 2004/07/13 07:59:54 noro Exp $ */
 
 #include "ca.h"
 #include "parse.h"
@@ -49,7 +49,7 @@ void chsgnquote(QUOTE a,QUOTE *c)
 {
 	FNODE fn;
 
-	fn = mkfnode(3,I_BOP,subfs,0,BDY(a));
+	fn = mkfnode(1,I_MINUS,BDY(a));
 	MKQUOTE(*c,fn);
 }
 
@@ -343,52 +343,43 @@ void vartoquote(V v,QUOTE *c)
 	}
 }
 
-typedef enum {
-	A_arg,A_arf,A_int,A_str,A_internal,A_node,A_notimpl,A_func,A_end
-} farg_type;
-
-typedef struct fid_spec {
-	fid id;
-	farg_type type[10];
-} *fid_spec_p;
-
 struct fid_spec fid_spec_tab[] = {
-	{I_BOP,A_arf,A_arg,A_arg,A_end},
-	{I_COP,A_int,A_arg,A_arg,A_end},
-	{I_AND,A_arg,A_arg,A_end},
-	{I_OR,A_arg,A_arg,A_end},
-	{I_NOT,A_arg,A_end},
-	{I_CE,A_arg,A_arg,A_end},
-	{I_PRESELF,A_arf,A_arg,A_end},
-	{I_POSTSELF,A_arf,A_arg,A_end},
-	{I_FUNC,A_func,A_arg,A_end},
-	{I_FUNC_OPT,A_func,A_arg,A_arg,A_end},
-	{I_IFUNC,A_arg,A_arg,A_end},
-	{I_MAP,A_func,A_arg,A_end},
-	{I_RECMAP,A_func,A_arg,A_end},
+	{I_BOP,A_arf,A_fnode,A_fnode,A_end},
+	{I_COP,A_int,A_fnode,A_fnode,A_end},
+	{I_AND,A_fnode,A_fnode,A_end},
+	{I_OR,A_fnode,A_fnode,A_end},
+	{I_NOT,A_fnode,A_end},
+	{I_CE,A_fnode,A_fnode,A_end},
+	{I_PRESELF,A_arf,A_fnode,A_end},
+	{I_POSTSELF,A_arf,A_fnode,A_end},
+	{I_FUNC,A_func,A_fnode,A_end},
+	{I_FUNC_OPT,A_func,A_fnode,A_fnode,A_end},
+	{I_IFUNC,A_fnode,A_fnode,A_end},
+	{I_MAP,A_func,A_fnode,A_end},
+	{I_RECMAP,A_func,A_fnode,A_end},
 	{I_PFDERIV,A_notimpl,A_end},
 	{I_ANS,A_int,A_end},
 	{I_PVAR,A_int,A_node,A_end},
-	{I_ASSPVAR,A_arg,A_arg,A_end},
+	{I_ASSPVAR,A_fnode,A_fnode,A_end},
 	{I_FORMULA,A_internal,A_end},
 	{I_LIST,A_node,A_end},
 	{I_STR,A_str,A_end},
 	{I_NEWCOMP,A_int,A_end},
-	{I_CAR,A_arg,A_end},
-	{I_CDR,A_arg,A_end},
+	{I_CAR,A_fnode,A_end},
+	{I_CDR,A_fnode,A_end},
 	{I_CAST,A_notimpl,A_end},
-	{I_INDEX,A_arg,A_node,A_end},
+	{I_INDEX,A_fnode,A_node,A_end},
 	{I_EV,A_node,A_end},
-	{I_TIMER,A_arg,A_arg,A_arg,A_end},
+	{I_TIMER,A_fnode,A_fnode,A_fnode,A_end},
 	{I_GF2NGEN,A_end},
 	{I_GFPNGEN,A_end},
 	{I_GFSNGEN,A_end},
-	{I_LOP,A_int,A_arg,A_arg,A_end},
-	{I_OPT,A_str,A_arg,A_end},
+	{I_LOP,A_int,A_fnode,A_fnode,A_end},
+	{I_OPT,A_str,A_fnode,A_end},
 	{I_GETOPT,A_str,A_end},
-	{I_POINT,A_arg,A_str,A_end},
-	{I_PAREN,A_arg,A_end},
-	{I_MINUS,A_arg,A_end},
+	{I_POINT,A_fnode,A_str,A_end},
+	{I_PAREN,A_fnode,A_end},
+	{I_MINUS,A_fnode,A_end},
 	{I_NARYOP,A_notimpl,A_end}
 };
 
@@ -414,6 +405,22 @@ FNODE strip_paren(FNODE f)
 	}
 }
 
+NODE flatten_fnodenode(NODE n,char *opname);
+FNODE flatten_fnode(FNODE f,char *opname);
+
+NODE flatten_fnodenode(NODE n,char *opname)
+{
+	NODE r0,r,t;
+
+	r0 = 0;
+	for ( t = n; t; t = NEXT(t) ) {
+		NEXTNODE(r0,r);
+		BDY(r) = (pointer)flatten_fnode((FNODE)BDY(t),opname);
+	}
+	if ( r0 ) NEXT(r) = 0;
+	return r0;
+}
+
 FNODE flatten_fnode(FNODE f,char *opname)
 {
 	fid_spec_p spec;
@@ -433,7 +440,7 @@ FNODE flatten_fnode(FNODE f,char *opname)
 		f2 = (pointer)flatten_fnode(FA2(f),opname);
 		f2 = strip_paren(f2);
 		if ( f1->id == I_BOP && !strcmp(((ARF)FA0(f1))->name,opname) ) {
-			/* [+ [+ A B] C] => [+ A [+ B C]] */
+			/* [op [op A B] C] => [op A [op B C]] */
 			return mkfnode(3,I_BOP,(ARF)FA0(f),FA1(f1),
 				mkfnode(3,I_BOP,(ARF)FA0(f),FA2(f1),f2));
 		} else
@@ -443,8 +450,10 @@ FNODE flatten_fnode(FNODE f,char *opname)
 		for ( i = 0; type[i] != A_end; i++ );
 		NEWFNODE(r,i); ID(r) = f->id;
 		for ( i = 0; type[i] != A_end; i++ ) {
-			if ( type[i] == A_arg )
+			if ( type[i] == A_fnode )
 				r->arg[i] = (pointer)flatten_fnode(f->arg[i],opname);
+			else if ( type[i] == A_node )
+				r->arg[i] = (pointer)flatten_fnodenode(f->arg[i],opname);
 			else
 				r->arg[i] = f->arg[i];
 		}