===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/quote.c,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -p -r1.6 -r1.10
--- OpenXM_contrib2/asir2000/parse/quote.c	2001/10/09 01:36:25	1.6
+++ OpenXM_contrib2/asir2000/parse/quote.c	2004/03/09 08:02:01	1.10
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.5 2001/09/05 09:01:28 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.9 2004/03/04 03:31:28 noro Exp $ */
 
 #include "ca.h"
 #include "parse.h"
@@ -67,6 +67,7 @@ void objtoquote(Obj a,QUOTE *c)
 
 	if ( !a ) {
 		MKQUOTE(*c,mkfnode(1,I_FORMULA,(pointer)a));
+		(*c)->attr = mknode(1,mknode(2,"RisaId",0));
 		return;
 	}
 	switch ( OID(a) ) {
@@ -78,9 +79,11 @@ void objtoquote(Obj a,QUOTE *c)
 			} else {
 				MKQUOTE(*c,mkfnode(1,I_FORMULA,(pointer)a));
 			}
+			(*c)->attr = mknode(1,mknode(2,"RisaId",O_N));
 			break;
 		case O_STR:
 			MKQUOTE(*c,mkfnode(1,I_FORMULA,(pointer)a));
+			(*c)->attr = mknode(1,mknode(2,"RisaId",O_STR));
 			break;
 		case O_P:
 			polytoquote((P)a,c);
@@ -89,6 +92,7 @@ void objtoquote(Obj a,QUOTE *c)
 			polytoquote(NM((R)a),&nm);
 			polytoquote(DN((R)a),&dn);
 			divquote(CO,nm,dn,c);
+			(*c)->attr = mknode(1,mknode(2,"RisaId",O_R));
 			break;
 		case O_LIST:
 			t0 = 0;
@@ -100,6 +104,7 @@ void objtoquote(Obj a,QUOTE *c)
 			if ( t0 )
 				NEXT(t) = 0;
 			MKQUOTE(*c,mkfnode(1,I_LIST,t0));
+			(*c)->attr = mknode(1,mknode(2,"RisaId",O_LIST));
 			break;
 		case O_VECT:
 			len = ((VECT)a)->len;
@@ -114,6 +119,7 @@ void objtoquote(Obj a,QUOTE *c)
 			t = mknode(2,mkfnode(1,I_FORMULA,q),mkfnode(1,I_LIST,t));
 			gen_searchf("vector",&f);
 			MKQUOTE(*c,mkfnode(2,I_FUNC,f,mkfnode(1,I_LIST,t)));
+			(*c)->attr = mknode(1,mknode(2,"RisaId",O_VECT));
 			break;
 		case O_MAT:
 			row = ((MAT)a)->row;
@@ -139,6 +145,7 @@ void objtoquote(Obj a,QUOTE *c)
 				mkfnode(1,I_FORMULA,qrow),mkfnode(1,I_FORMULA,qcol),fn);
 			gen_searchf("matrix",&f);
 			MKQUOTE(*c,mkfnode(2,I_FUNC,f,mkfnode(1,I_LIST,t)));
+			(*c)->attr = mknode(1,mknode(2,"RisaId",O_MAT));
 			break;
 		case O_DP:
 			dptoquote((DP)a,c);
@@ -155,92 +162,135 @@ void polytoquote(P a,QUOTE *c)
 {
 	DCP dc,t;
 	DCP *dca;
-	int n,i;
+	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));
+		(*c)->attr = mknode(1,mknode(2,"RisaId",0));
 		return;
+	} else if ( OID(a) == O_N ) {
+		MKQUOTE(*c,mkfnode(1,I_FORMULA,(pointer)a));
+		(*c)->attr = mknode(1,mknode(2,"RisaId",O_N));
+		return;
 	}
-	dc = DC((P)a);
 	vartoquote(VR((P)a),&v);
-	for ( t = dc, n = 0; t; t = NEXT(t), n++ );
-	dca = (DCP *)ALLOCA(n*sizeof(DCP));
-	for ( t = dc, i = 0; t; t = NEXT(t), i++ )
-		dca[i] = t;
-	dctoquote(dca[n-1],v,&r);
-	for ( i = n-2; i >= 0; i-- ) {
-		dctoquote(dca[i],v,&s);
-		addquote(CO,s,r,&u);
+	dc = DC((P)a);
+	dctoquote(dc,v,&r,&sgn);
+	if ( sgn == -1 ) {
+		MKQUOTE(u,mkfnode(1,I_MINUS,BDY(r)));
 		r = u;
 	}
+	for (dc = NEXT(dc); dc; dc = NEXT(dc) ) {
+		dctoquote(dc,v,&s,&sgn);
+		if ( sgn == -1 )
+			subquote(CO,r,s,&u);
+		else
+			addquote(CO,r,s,&u);
+		r = u;
+	}
 	*c = r;
+	(*c)->attr = mknode(1,mknode(2,"RisaId",O_P));
 }
 
 void dptoquote(DP a,QUOTE *c)
 {
 	MP t;
-	MP *m;
-	int i,n,nv;
+	MP m;
+	int i,n,nv,sgn;
 	QUOTE s,r,u;
 
 	if ( !a ) {
 		MKQUOTE(*c,mkfnode(1,I_FORMULA,(pointer)a));
+		(*c)->attr = mknode(1,mknode(2,"RisaId",0));
 		return;
 	}
-	for ( t = BDY(a), n = 0; t; t = NEXT(t), n++ );
-	m = (MP *)ALLOCA(n*sizeof(MP));
-	for ( t = BDY(a), i = 0; t; t = NEXT(t), i++ )
-		m[i] = t;
 	nv = NV(a);
-	mptoquote(m[n-1],nv,&r);
-	for ( i = n-2; i >= 0; i-- ) {
-		mptoquote(m[i],nv,&s);
-		addquote(CO,s,r,&u);
+	m = BDY(a);
+	mptoquote(m,nv,&r,&sgn);
+	if ( sgn == -1 ) {
+		MKQUOTE(u,mkfnode(1,I_MINUS,BDY(r)));
 		r = u;
 	}
+	for ( m = NEXT(m); m; m = NEXT(m) ) {
+		mptoquote(m,nv,&s,&sgn);
+		if ( sgn < 0 )
+			subquote(CO,r,s,&u);
+		else
+			addquote(CO,r,s,&u);
+		r = u;
+	}
 	*c = r;
+	(*c)->attr = mknode(1,mknode(2,"RisaId",O_DP));
 }
 
-void dctoquote(DCP dc,QUOTE v,QUOTE *c)
+void dctoquote(DCP dc,QUOTE v,QUOTE *q,int *sgn)
 {
-	QUOTE d,s,u;
+	QUOTE t,s,u,r;
+	P c;
+	Q d;
 
-	if ( UNIQ(COEF(dc)) ) {
-		if ( DEG(dc) ) {
-			if ( UNIQ(DEG(dc)) )
-				*c = v;
+	if ( mmono(COEF(dc)) ) {
+		/* -xyz... */
+		chsgnp(COEF(dc),&c);
+		*sgn = -1;
+	} else {
+		c = COEF(dc);
+		*sgn = 1;
+	}
+	d = DEG(dc);
+	if ( UNIQ(c) ) {
+		if ( d ) {
+			if ( UNIQ(d) )
+				r = v;
 			else {
-				objtoquote((Obj)DEG(dc),&d);
-				pwrquote(CO,v,d,c);
+				objtoquote((Obj)d,&t);
+				pwrquote(CO,v,t,&r);
 			}
 		} else
-			objtoquote((Obj)ONE,c);	
+			objtoquote((Obj)ONE,&r);	
 	} else {
-		objtoquote((Obj)COEF(dc),&u);
-		if ( DEG(dc) ) {
-			if ( UNIQ(DEG(dc)) )
+		objtoquote((Obj)c,&u);
+		if ( !NUM(c) && NEXT(DC(c)) ) {
+			MKQUOTE(t,mkfnode(1,I_PAREN,BDY(u)));
+			u = t;
+		}
+		if ( d ) {
+			if ( UNIQ(d) )
 				s = v;
 			else {
-				objtoquote((Obj)DEG(dc),&d);
-				pwrquote(CO,v,d,&s);
+				objtoquote((Obj)d,&t);
+				pwrquote(CO,v,t,&s);
 			}
-			mulquote(CO,u,s,c);
+			mulquote(CO,u,s,&r);
 		} else
-			*c = u;
+			r = u;
 	}
+	*q = r;
 }
 
-void mptoquote(MP m,int n,QUOTE *c)
+void mptoquote(MP m,int n,QUOTE *r,int *sgn)
 {
 	QUOTE s,u;
+	P c;
 	NODE t,t1;
 	FNODE f;
 	Q q;
 	DL dl;
 	int i;
 
-	objtoquote((Obj)C(m),&s);
+	if ( mmono(C(m)) ) {
+		chsgnp(C(m),&c);
+		*sgn = -1;
+	} else {
+		c = C(m);
+		*sgn = 1;
+	}
+	objtoquote((Obj)c,&s);
+	if ( !NUM(c) && NEXT(DC(c)) ) {
+		MKQUOTE(u,mkfnode(1,I_PAREN,BDY(s)));
+		s = u;
+	}
 	dl = m->dl;
 	for ( i = n-1, t = 0; i >= 0; i-- ) {
 		STOQ(dl->d[i],q);
@@ -249,7 +299,10 @@ void mptoquote(MP m,int n,QUOTE *c)
 		t = t1;
 	}
 	MKQUOTE(u,mkfnode(1,I_EV,t));
-	mulquote(CO,s,u,c);
+	if ( UNIQ(c) )
+		*r = u;
+	else
+		mulquote(CO,s,u,r);
 }
 
 void vartoquote(V v,QUOTE *c)