===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.55
retrieving revision 1.65
diff -u -p -r1.55 -r1.65
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2005/07/26 01:33:46	1.55
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2005/09/30 01:35:25	1.65
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.54 2005/07/15 00:23:26 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.64 2005/09/29 08:55:26 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -78,7 +78,9 @@ void Pquotetotex();
 void Pquotetotex_env();
 void Pflatten_quote();
 void Pquote_to_funargs(),Pfunargs_to_quote(),Pget_function_name();
-void Pquote_unify();
+void Pquote_unify(),Pget_quote_id();
+void Pquote_to_nary(),Pquote_to_bin();
+void do_assign(NODE arg);
 void fnodetotex_tb(FNODE f,TB tb);
 char *symbol_name(char *name);
 char *conv_rule(char *name);
@@ -88,7 +90,7 @@ void tb_to_string(TB tb,STRING *rp);
 void fnodenodetotex_tb(NODE n,TB tb);
 void fargstotex_tb(char *opname,FNODE f,TB tb);
 int top_is_minus(FNODE f);
-NODE quote_unify(Obj f,Obj pat);
+int quote_unify(Obj f,Obj pat,NODE *rp);
 
 struct ftab str_tab[] = {
 	{"sprintf",Psprintf,-99999999},
@@ -104,10 +106,13 @@ struct ftab str_tab[] = {
 	{"clear_tb",Pclear_tb,1},
 	{"tb_to_string",Ptb_to_string,1},
 	{"string_to_tb",Pstring_to_tb,1},
+	{"get_quote_id",Pget_quote_id,1},
+	{"quote_to_nary",Pquote_to_nary,1},
+	{"quote_to_bin",Pquote_to_bin,2},
 	{"quotetotex_tb",Pquotetotex_tb,2},
 	{"quotetotex",Pquotetotex,1},
 	{"quotetotex_env",Pquotetotex_env,-99999999},
-	{"flatten_quote",Pflatten_quote,2},
+	{"flatten_quote",Pflatten_quote,-2},
 	{"quote_to_funargs",Pquote_to_funargs,1},
 	{"quote_unify",Pquote_unify,2},
 	{"funargs_to_quote",Pfunargs_to_quote,1},
@@ -507,24 +512,81 @@ void Pwrite_to_tb(NODE arg,Q *rp)
 	*rp = 0;	
 }
 
-void Pquote_unify(NODE arg,LIST *rp)
+FNODE partial_eval(FNODE), quote_to_nary(FNODE), quote_to_bin(FNODE,int);
+
+void Pquote_to_nary(NODE arg,QUOTE *rp)
 {
+	FNODE f;
+
+	f = quote_to_nary(BDY((QUOTE)ARG0(arg)));
+	MKQUOTE(*rp,f);	
+}
+
+void Pquote_to_bin(NODE arg,QUOTE *rp)
+{
+	FNODE f;
+	int direction;
+
+	direction = QTOS((Q)ARG1(arg));
+	f = quote_to_bin(BDY((QUOTE)ARG0(arg)),direction);
+
+	MKQUOTE(*rp,f);	
+}
+
+void Pquote_unify(NODE arg,Q *rp)
+{
+	FNODE f,g;
+	Obj obj;
+	QUOTE q;
 	NODE r;
+	int ret;
 
-	r = quote_unify((Obj)ARG0(arg),(Obj)ARG1(arg));
-	MKLIST(*rp,r);
+#if 0
+	g = partial_eval(BDY(((QUOTE)ARG0(arg))));
+	MKQUOTE(q,g);
+	ret = quote_unify((Obj)q,(Obj)ARG1(arg),&r);
+#else
+	obj = (Obj)ARG0(arg);
+	if ( !obj || OID(obj) != O_QUOTE) {
+		objtoquote(obj,&q); obj = (Obj)q;
+	}
+	ret = quote_unify(obj,(Obj)ARG1(arg),&r);
+#endif
+	if ( ret ) {
+		do_assign(r);
+		*rp = ONE;
+	} else
+		*rp = 0;
 }
 
+void do_assign(NODE arg)
+{
+	NODE t,pair;
+	int pv;
+
+	QUOTE value;
+
+	for ( t = arg; t; t = NEXT(t) ) {
+		pair = BDY((LIST)BDY(t));
+		pv = (int)FA0((FNODE)BDY((QUOTE)BDY(pair)));
+		value = (QUOTE)(BDY(NEXT(pair)));
+		ASSPV(pv,value);
+	}
+}
+
 /* 
-/* consistency check and merge */
+/* consistency check and merge
+ */
 
-NODE merge_matching_node(NODE n,NODE a)
+int merge_matching_node(NODE n,NODE a,NODE *rp)
 {
 	NODE ta,ba,tn,bn;
 	QUOTE pa,va,pn,vn;
 
-	if ( !n )
-		return a;
+	if ( !n ) {
+		*rp = a;
+		return 1;
+	}
 	for ( ta = a; ta; ta = NEXT(ta) ) {
 		ba = BDY((LIST)BDY(ta));
 		if ( !ba ) continue;
@@ -543,21 +605,25 @@ NODE merge_matching_node(NODE n,NODE a)
 			n = tn;
 		}
 	}
-	return n;
+	*rp = n;
+	return 1;
 }
 
-NODE quote_unify_node(NODE f,NODE pat) {
-	NODE r,a,tf,tp;
+int quote_unify_node(NODE f,NODE pat,NODE *rp) {
+	NODE r,a,tf,tp,r1;
+	int ret;
 
 	if ( length(f) != length(pat) ) return 0;
 	r = 0;
 	for ( tf = f, tp = pat; tf; tf = NEXT(tf), tp = NEXT(tp) ) {
-		a = quote_unify((Obj)BDY(tf),(Obj)BDY(tp));
-		if ( !a ) return 0;
-		r = merge_matching_node(r,a);
-		if ( !r ) return 0;
+		ret = quote_unify((Obj)BDY(tf),(Obj)BDY(tp),&a);
+		if ( !ret ) return 0;
+		ret = merge_matching_node(r,a,&r1);
+		if ( !ret ) return 0;
+		else r = r1;
 	}
-	return r;
+	*rp = r;
+	return 1;
 }
 
 void get_quote_id_arg(QUOTE f,int *id,NODE *r)
@@ -569,19 +635,22 @@ void get_quote_id_arg(QUOTE f,int *id,NODE *r)
 	*id = QTOS((Q)BDY(fab)); *r = NEXT(fab);
 }
 
-/* ret : [[quote(A),quote(1)],...] */
+/* *rp : [[quote(A),quote(1)],...] */
 
-NODE quote_unify(Obj f, Obj pat)
+int quote_unify(Obj f, Obj pat, NODE *rp)
 {
 	NODE tf,tp,head,body;
 	NODE parg,farg,r;
 	LIST fa,l;
 	int pid,id;
 	FUNC ff,pf;
+	int ret;
+	QUOTE q;
+	FNODE g;
 
 	if ( OID(pat) == O_LIST ) {
 		if ( OID(f) == O_LIST )
-			return quote_unify_node(BDY((LIST)f),BDY((LIST)pat));
+			return quote_unify_node(BDY((LIST)f),BDY((LIST)pat),rp);
 		else
 			return 0;
 	} else if ( OID(pat) == O_QUOTE ) {
@@ -593,36 +662,57 @@ NODE quote_unify(Obj f, Obj pat)
 				if ( compquote(CO,f,pat) )
 					return 0;
 				else {
-					MKLIST(l,0);
-					return mknode(1,l);
+					*rp = 0;
+					return 1;
 				}
 				break;
 			case I_LIST:
-				return quote_unify_node(BDY((LIST)BDY(farg)),BDY((LIST)BDY(parg)));
+				return quote_unify_node(BDY((LIST)BDY(farg)),
+							BDY((LIST)BDY(parg)),rp);
 			case I_PVAR:
 				/* [[pat,f]] */
 				r = mknode(2,pat,f); MKLIST(l,r);
-				return mknode(1,l);
+				*rp =  mknode(1,l);
+				return 1;
 			case I_IFUNC:
 				/* F(X,Y,...) = ... */
 				if ( id == I_FUNC ) {
 					r = mknode(2,BDY(parg),BDY(farg)); MKLIST(l,r);
 					head = mknode(1,l);
-					body = quote_unify(BDY(NEXT(farg)),BDY(NEXT(parg)));
-					if ( !body ) return 0;
-					return merge_matching_node(head,body);
+					ret = quote_unify(BDY(NEXT(farg)),
+								BDY(NEXT(parg)),&body);
+					if ( !ret ) return 0;
+					else return merge_matching_node(head,body,rp);
 				} else
 					return 0;
+
+			case I_NARYOP:
 			case I_BOP:
-			case I_FUNC:
 				/* X+Y = ... */
+				if ( compqa(CO,BDY(farg),BDY(parg)) ) return 0;
+
+				/* XXX converting to I_BOP */
+				if ( ((FNODE)BDY((QUOTE)pat))->id == I_NARYOP ) {
+					g = quote_to_bin(BDY((QUOTE)pat),1);
+					MKQUOTE(q,g);
+					get_quote_id_arg((QUOTE)q,&pid,&parg);
+				}
+				if ( ((FNODE)BDY((QUOTE)f))->id == I_NARYOP ) {
+					g = quote_to_bin(BDY((QUOTE)f),1);
+					MKQUOTE(q,g);
+					get_quote_id_arg((QUOTE)q,&id,&farg);
+				}
+				return quote_unify_node(NEXT(farg),NEXT(parg),rp);
+				break;
+
+			case I_FUNC:
 				/* f(...) = ... */
 				if ( compqa(CO,BDY(farg),BDY(parg)) ) return 0;
-				return quote_unify_node(NEXT(farg),NEXT(parg));
+				return quote_unify_node(NEXT(farg),NEXT(parg),rp);
 				break;
 			default:
 				if ( pid == id )
-					return quote_unify_node(farg,parg);
+					return quote_unify_node(farg,parg,rp);
 				else
 					return 0;
 		}
@@ -1475,11 +1565,28 @@ void Pflatten_quote(NODE arg,Obj *rp)
 
 	if ( !ARG0(arg) || OID((Obj)ARG0(arg)) != O_QUOTE )
 		*rp = (Obj)ARG0(arg);
-	else {
+	else if ( argc(arg) == 1 ) {
+		f = flatten_fnode(BDY((QUOTE)ARG0(arg)),"+");
+		f = flatten_fnode(f,"*");
+		MKQUOTE(q,f);
+		*rp = (Obj)q;
+	} else {
 		f = flatten_fnode(BDY((QUOTE)ARG0(arg)),BDY((STRING)ARG1(arg)));
 		MKQUOTE(q,f);
 		*rp = (Obj)q;
 	}
+}
+
+void Pget_quote_id(NODE arg,Q *rp)
+{
+	FNODE f;
+	QUOTE q;
+
+	q = (QUOTE)ARG0(arg);
+	if ( !q || OID(q) != O_QUOTE )
+		error("get_quote_id : invalid argument");
+	f = BDY(q);
+	STOQ((int)f->id,*rp);
 }
 
 void Pquote_to_funargs(NODE arg,LIST *rp)