===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/quote.c,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -p -r1.8 -r1.11
--- OpenXM_contrib2/asir2000/parse/quote.c	2004/03/04 01:41:32	1.8
+++ OpenXM_contrib2/asir2000/parse/quote.c	2004/03/10 02:41:08	1.11
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.7 2004/03/03 09:25:30 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.10 2004/03/09 08:02:01 noro Exp $ */
 
 #include "ca.h"
 #include "parse.h"
@@ -158,9 +158,12 @@ void polytoquote(P a,QUOTE *c)
 	int n,i,sgn;
 	QUOTE v,r,s,u;
 
-	if ( !a || (OID(a) == O_N) ) {
+	if ( !a ) {
 		MKQUOTE(*c,mkfnode(1,I_FORMULA,(pointer)a));
 		return;
+	} else if ( OID(a) == O_N ) {
+		MKQUOTE(*c,mkfnode(1,I_FORMULA,(pointer)a));
+		return;
 	}
 	vartoquote(VR((P)a),&v);
 	dc = DC((P)a);
@@ -277,21 +280,17 @@ void mptoquote(MP m,int n,QUOTE *r,int *sgn)
 		s = u;
 	}
 	dl = m->dl;
-	if ( !dl->td )
-		*r = s;	
-	else {
-		for ( i = n-1, t = 0; i >= 0; i-- ) {
-			STOQ(dl->d[i],q);
-			f = mkfnode(1,I_FORMULA,q);
-			MKNODE(t1,f,t);
-			t = t1;
-		}
-		MKQUOTE(u,mkfnode(1,I_EV,t));
-		if ( UNIQ(c) )
-			*r = u;
-		else
-			mulquote(CO,s,u,r);
+	for ( i = n-1, t = 0; i >= 0; i-- ) {
+		STOQ(dl->d[i],q);
+		f = mkfnode(1,I_FORMULA,q);
+		MKNODE(t1,f,t);
+		t = t1;
 	}
+	MKQUOTE(u,mkfnode(1,I_EV,t));
+	if ( UNIQ(c) )
+		*r = u;
+	else
+		mulquote(CO,s,u,r);
 }
 
 void vartoquote(V v,QUOTE *c)