===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/quote.c,v
retrieving revision 1.17
retrieving revision 1.20
diff -u -p -r1.17 -r1.20
--- OpenXM_contrib2/asir2000/parse/quote.c	2004/07/13 07:59:54	1.17
+++ OpenXM_contrib2/asir2000/parse/quote.c	2004/08/09 06:42:53	1.20
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.16 2004/07/08 03:00:30 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.19 2004/08/05 00:56:54 noro Exp $ */
 
 #include "ca.h"
 #include "parse.h"
@@ -318,13 +318,12 @@ void vartoquote(V v,QUOTE *c)
 			if ( x && OID(x)==O_P && !NEXT(DC(x))
 				&& UNIQ(DEG(DC(x))) && UNIQ(COEF(DC(x))) ) {
 				/* use a as is */
-				u = a;
 			} else {
 				/* a => (a) */
-				MKQUOTE(u,mkfnode(1,I_PAREN,BDY(a)));
+				MKQUOTE(u,mkfnode(1,I_PAREN,BDY(a))); a = u;
 			}
 			objtoquote(ad[1].arg,&b);
-			pwrquote(CO,u,b,c);
+			pwrquote(CO,a,b,c);
 		} else {
 			for ( i = 0; i < pf->argc; i++ )
 				if ( ad[i].d )
@@ -405,6 +404,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;
@@ -436,6 +451,8 @@ FNODE flatten_fnode(FNODE f,char *opname)
 		for ( i = 0; type[i] != A_end; i++ ) {
 			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];
 		}