===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/quote.c,v
retrieving revision 1.10
retrieving revision 1.21
diff -u -p -r1.10 -r1.21
--- OpenXM_contrib2/asir2000/parse/quote.c	2004/03/09 08:02:01	1.10
+++ OpenXM_contrib2/asir2000/parse/quote.c	2005/04/07 08:33:12	1.21
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.9 2004/03/04 03:31:28 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/parse/quote.c,v 1.20 2004/08/09 06:42:53 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);
 }
 
@@ -67,7 +67,6 @@ 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) ) {
@@ -79,11 +78,9 @@ 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);
@@ -92,7 +89,6 @@ 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;
@@ -104,7 +100,6 @@ 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;
@@ -119,7 +114,6 @@ 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;
@@ -145,7 +139,6 @@ 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);
@@ -167,11 +160,9 @@ void polytoquote(P a,QUOTE *c)
 
 	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;
 	}
 	vartoquote(VR((P)a),&v);
@@ -190,7 +181,6 @@ void polytoquote(P a,QUOTE *c)
 		r = u;
 	}
 	*c = r;
-	(*c)->attr = mknode(1,mknode(2,"RisaId",O_P));
 }
 
 void dptoquote(DP a,QUOTE *c)
@@ -202,7 +192,6 @@ void dptoquote(DP a,QUOTE *c)
 
 	if ( !a ) {
 		MKQUOTE(*c,mkfnode(1,I_FORMULA,(pointer)a));
-		(*c)->attr = mknode(1,mknode(2,"RisaId",0));
 		return;
 	}
 	nv = NV(a);
@@ -221,7 +210,6 @@ void dptoquote(DP a,QUOTE *c)
 		r = u;
 	}
 	*c = r;
-	(*c)->attr = mknode(1,mknode(2,"RisaId",O_DP));
 }
 
 void dctoquote(DCP dc,QUOTE v,QUOTE *q,int *sgn)
@@ -251,7 +239,7 @@ void dctoquote(DCP dc,QUOTE v,QUOTE *q,int *sgn)
 			objtoquote((Obj)ONE,&r);	
 	} else {
 		objtoquote((Obj)c,&u);
-		if ( !NUM(c) && NEXT(DC(c)) ) {
+		if ( !NUM(c) && NEXT(DC(c)) && d ) {
 			MKQUOTE(t,mkfnode(1,I_PAREN,BDY(u)));
 			u = t;
 		}
@@ -310,7 +298,7 @@ void vartoquote(V v,QUOTE *c)
 	P x;
 	PF pf;
 	PFAD ad;
-	QUOTE a,b;
+	QUOTE a,b,u;
 	int i;
 	FUNC f;
 	NODE t,t1;
@@ -324,7 +312,17 @@ void vartoquote(V v,QUOTE *c)
 		ad = ((PFINS)v->priv)->ad;
 		if ( !strcmp(NAME(pf),"pow") ) {
 			/* pow(a,b) = a^b */
-			objtoquote(ad[0].arg,&a); objtoquote(ad[1].arg,&b);
+			objtoquote(ad[0].arg,&a);
+			x = (P)ad[0].arg;
+			/* check whether x is a variable */
+			if ( x && OID(x)==O_P && !NEXT(DC(x))
+				&& UNIQ(DEG(DC(x))) && UNIQ(COEF(DC(x))) ) {
+				/* use a as is */
+			} else {
+				/* a => (a) */
+				MKQUOTE(u,mkfnode(1,I_PAREN,BDY(a))); a = u;
+			}
+			objtoquote(ad[1].arg,&b);
 			pwrquote(CO,a,b,c);
 		} else {
 			for ( i = 0; i < pf->argc; i++ )
@@ -342,4 +340,221 @@ void vartoquote(V v,QUOTE *c)
 			MKQUOTE(*c,mkfnode(2,I_FUNC,f,mkfnode(1,I_LIST,t)));
 		}
 	}
+}
+
+/* 
+ * A_arf : arithmetic function
+ * A_int : machine integer
+ * A_fnode : FNODE
+ * A_node : NODE with FNODE bodies
+ * A_internal : internal object
+ * A_str : string
+ * A_end : terminal
+ * A_func : FUNC
+ * A_notimpl : not implemented
+ */
+
+struct fid_spec fid_spec_tab[] = {
+	{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_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_fnode,A_end},
+	{I_CDR,A_fnode,A_end},
+	{I_CAST,A_notimpl,A_end},
+	{I_INDEX,A_fnode,A_node,A_end},
+	{I_EV,A_node,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_fnode,A_fnode,A_end},
+	{I_OPT,A_str,A_fnode,A_end},
+	{I_GETOPT,A_str,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}
+};
+
+#define N_FID_SPEC (sizeof(fid_spec_tab)/sizeof(struct fid_spec))
+
+void get_fid_spec(fid id,fid_spec_p *spec)
+{
+	int i;
+
+	for ( i = 0; i < N_FID_SPEC; i++ )
+		if ( fid_spec_tab[i].id == id ) {
+			*spec = &fid_spec_tab[i];
+			return;
+		}
+	*spec = 0;
+}
+
+FNODE strip_paren(FNODE f)
+{
+	if ( !f || f->id != I_PAREN ) return f;
+	else {
+		return strip_paren((FNODE)FA0(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;
+	farg_type *type;
+	fid id;
+	FNODE f1,f2,r;
+	int i;
+
+	if ( !f ) return f;
+	id = f->id;
+	get_fid_spec(id,&spec);
+	/* unknown fid */
+	if ( !spec ) return f;
+	if ( id == I_BOP && !strcmp(((ARF)FA0(f))->name,opname) ) {
+		f1 = (pointer)flatten_fnode(FA1(f),opname);
+		f1 = strip_paren(f1);
+		f2 = (pointer)flatten_fnode(FA2(f),opname);
+		f2 = strip_paren(f2);
+		if ( f1->id == I_BOP && !strcmp(((ARF)FA0(f1))->name,opname) ) {
+			/* [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
+			return mkfnode(3,I_BOP,(ARF)FA0(f),f1,f2);
+	} else {
+		type = spec->type;
+		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_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];
+		}
+		return r;
+	}
+}
+
+/* comparison of QUOTE */
+
+int compquote(VL vl,QUOTE q1,QUOTE q2)
+{
+	return compfnode(BDY(q1),BDY(q2));
+}
+
+/* comparison of QUOTEARG */
+/* XXX : executes a non-sense comparison for bodies */
+
+int compqa(VL vl,QUOTEARG q1,QUOTEARG q2)
+{
+	if ( !q1 ) return q2?-1:0;
+	else if ( !q2 ) return 1;
+	else if ( OID(q1) > OID(q2) ) return 1;
+	else if ( OID(q1) < OID(q2) ) return -1;
+	else if ( q1->type > q2->type ) return 1;
+	else if ( q1->type < q2->type ) return -1;
+	else switch ( q1->type ) {
+		case A_func:
+			return strcmp(((FUNC)q1->body)->name,((FUNC)q2->body)->name);		
+		case A_arf:
+			return strcmp(((ARF)q1->body)->name,((ARF)q2->body)->name);		
+		default:
+			if ( (unsigned)q1->body  > (unsigned)q2->body ) return 1;
+			else if ( (unsigned)q1->body  < (unsigned)q2->body ) return -1;
+			else return 0;
+	}
+}
+
+int compfnode(FNODE f1,FNODE f2)
+{
+	fid_spec_p spec;
+	int t,s1,s2,i;
+	NODE n1,n2;
+
+	if ( !f1 ) return f2 ? -1 : 1;
+	else if ( !f2 ) return 1;
+    else if ( f1->id > f2->id ) return 1;
+	else if ( f1->id < f2->id ) return -1;
+	spec = fid_spec_tab+f1->id;
+	for ( i = 0; spec->type[i] != A_end; i++ ) {
+		switch ( spec->type[i] ) {
+			case A_fnode:
+				return compfnode((FNODE)f1->arg[i],(FNODE)f2->arg[i]);
+				break;
+			case A_int:
+				s1 = (int)f1->arg[i];
+				s2 = (int)f2->arg[i];
+				if ( s1 > s2 ) return 1;
+				else if ( s1 < s2 ) return -1;
+				break;
+			case A_str:
+				t = strcmp((char *)f1->arg[i],(char *)f2->arg[i]);
+				if ( t ) return t;
+				break;
+			case A_internal:
+				t = arf_comp(CO,(Obj)f1->arg[i],(Obj)f2->arg[i]);
+				if ( t ) return t;
+				break;
+			case A_node:
+				n1 = (NODE)f1->arg[i];
+				n2 = (NODE)f2->arg[i];
+				for ( ; n1 && n2; n1 = NEXT(n1), n2 = NEXT(n2) ) {
+					t = compfnode(BDY(n1),BDY(n2));
+					if ( t ) return t;
+				}
+				if ( n1 ) return 1;
+				else if ( n2 ) return -1;
+				break;
+			case A_arf:
+				 t = strcmp(((ARF)f1->arg[i])->name,((ARF)f2->arg[i])->name);
+				if ( t ) return t;
+				break;
+			case A_func:
+				 t = strcmp(((FUNC)f1->arg[i])->name,((FUNC)f2->arg[i])->name);
+				if ( t ) return t;
+				break;
+			case A_notimpl:
+			default:
+				error("compfnode : not implemented");
+				break;
+		}
+	}
+	return 0;
 }