===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/strobj.c,v
retrieving revision 1.64
retrieving revision 1.67
diff -u -p -r1.64 -r1.67
--- OpenXM_contrib2/asir2000/builtin/strobj.c	2005/09/29 08:55:26	1.64
+++ OpenXM_contrib2/asir2000/builtin/strobj.c	2005/10/03 00:06:40	1.67
@@ -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.63 2005/09/28 08:08:34 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/strobj.c,v 1.66 2005/09/30 02:20:06 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -112,7 +112,7 @@ struct ftab str_tab[] = {
 	{"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},
@@ -536,6 +536,7 @@ void Pquote_to_bin(NODE arg,QUOTE *rp)
 void Pquote_unify(NODE arg,Q *rp)
 {
 	FNODE f,g;
+	Obj obj;
 	QUOTE q;
 	NODE r;
 	int ret;
@@ -545,7 +546,8 @@ void Pquote_unify(NODE arg,Q *rp)
 	MKQUOTE(q,g);
 	ret = quote_unify((Obj)q,(Obj)ARG1(arg),&r);
 #else
-	ret = quote_unify((Obj)ARG0(arg),(Obj)ARG1(arg),&r);
+	obj = (Obj)ARG0(arg);
+	ret = quote_unify(obj,(Obj)ARG1(arg),&r);
 #endif
 	if ( ret ) {
 		do_assign(r);
@@ -621,6 +623,40 @@ int quote_unify_node(NODE f,NODE pat,NODE *rp) {
 	return 1;
 }
 
+/* f = [a,b,c,...] pat = [X,Y,...] rpat matches the rest of f */
+
+int quote_unify_cons(NODE f,NODE pat,Obj rpat,NODE *rp) {
+	QUOTE q;
+	Q id;
+	FNODE fn;
+	NODE r,a,tf,tp,r1,arg;
+	int ret;
+	LIST list,alist;
+
+	/* matching of the head part */
+	if ( length(f) < length(pat) ) return 0;
+	r = 0;
+	for ( tf = f, tp = pat; tp; tf = NEXT(tf), tp = NEXT(tp) ) {
+		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;
+	}
+	/* matching of the rest */
+	MKLIST(list,tf);
+	STOQ(I_LIST,id); a = mknode(2,id,list);
+	MKLIST(alist,a);
+	arg = mknode(1,alist);
+	Pfunargs_to_quote(arg,&q);
+	ret = quote_unify((Obj)q,rpat,&a);
+	if ( !ret ) return 0;
+	ret = merge_matching_node(r,a,&r1);
+	if ( !ret ) return 0;
+	*rp = r1;
+	return 1;
+}
+
 void get_quote_id_arg(QUOTE f,int *id,NODE *r)
 {
 	LIST fa;
@@ -636,6 +672,7 @@ int quote_unify(Obj f, Obj pat, NODE *rp)
 {
 	NODE tf,tp,head,body;
 	NODE parg,farg,r;
+	Obj rpat;
 	LIST fa,l;
 	int pid,id;
 	FUNC ff,pf;
@@ -643,34 +680,56 @@ int quote_unify(Obj f, Obj pat, NODE *rp)
 	QUOTE q;
 	FNODE g;
 
-	if ( OID(pat) == O_LIST ) {
+	if ( !f )
+		if ( !pat ) {
+			*rp = 0; return 1;
+		} else
+			return 0;
+	else if ( OID(pat) == O_LIST ) {
 		if ( OID(f) == O_LIST )
 			return quote_unify_node(BDY((LIST)f),BDY((LIST)pat),rp);
 		else
 			return 0;
 	} else if ( OID(pat) == O_QUOTE ) {
-		if ( OID(f) != O_QUOTE ) return 0;
-		get_quote_id_arg((QUOTE)pat,&pid,&parg);
-		get_quote_id_arg((QUOTE)f,&id,&farg);
+		pid = ((FNODE)BDY((QUOTE)pat))->id;
 		switch ( pid ) {
 			case I_FORMULA:
 				if ( compquote(CO,f,pat) )
 					return 0;
 				else {
-					*rp = 0;
-					return 1;
+					*rp = 0; return 1;
 				}
 				break;
-			case I_LIST:
-				return quote_unify_node(BDY((LIST)BDY(farg)),
-							BDY((LIST)BDY(parg)),rp);
+
+			case I_LIST: case I_CONS:
+				get_quote_id_arg((QUOTE)pat,&pid,&parg);
+				if ( OID(f) == O_LIST )
+					tf = BDY((LIST)f);
+				else if ( OID(f) == O_QUOTE 
+					&& ((FNODE)BDY((QUOTE)f))->id == pid ) {
+					get_quote_id_arg((QUOTE)f,&id,&farg);
+					tf = BDY((LIST)BDY(farg));
+				} else
+					return 0;
+
+				tp = BDY((LIST)BDY(parg));
+				if ( pid == I_LIST )
+					return quote_unify_node(tf,tp,rp);
+				else {
+					rpat = (Obj)BDY(NEXT(parg));
+					return quote_unify_cons(tf,tp,rpat,rp);
+				}
+
 			case I_PVAR:
 				/* [[pat,f]] */
 				r = mknode(2,pat,f); MKLIST(l,r);
 				*rp =  mknode(1,l);
 				return 1;
+
 			case I_IFUNC:
 				/* F(X,Y,...) = ... */
+				get_quote_id_arg((QUOTE)f,&id,&farg);
+				get_quote_id_arg((QUOTE)pat,&pid,&parg);
 				if ( id == I_FUNC ) {
 					r = mknode(2,BDY(parg),BDY(farg)); MKLIST(l,r);
 					head = mknode(1,l);
@@ -681,35 +740,36 @@ int quote_unify(Obj f, Obj pat, NODE *rp)
 				} else
 					return 0;
 
-			case I_NARYOP:
-			case I_BOP:
+			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 ( OID(f) != O_QUOTE ) return 0;
+				id = ((FNODE)BDY((QUOTE)f))->id;
+				if ( pid == I_FUNC )
+					;
+				else {
+					/* XXX converting to I_BOP */
+					if ( pid == I_NARYOP ) {
+						g = quote_to_bin(BDY((QUOTE)pat),1);
+						MKQUOTE(q,g); pat = (Obj)q;
+					}
+					if ( id == I_NARYOP ) {
+						g = quote_to_bin(BDY((QUOTE)f),1);
+						MKQUOTE(q,g); f = (Obj)q;
+					}
+				}
+				get_quote_id_arg((QUOTE)pat,&pid,&parg);
+				get_quote_id_arg((QUOTE)f,&id,&farg);
 				if ( compqa(CO,BDY(farg),BDY(parg)) ) return 0;
 				return quote_unify_node(NEXT(farg),NEXT(parg),rp);
-				break;
+
 			default:
-				if ( pid == id )
-					return quote_unify_node(farg,parg,rp);
-				else
-					return 0;
+				if ( OID(f) != O_QUOTE ) return 0;
+				id = ((FNODE)BDY((QUOTE)f))->id;
+				if ( id != pid ) return 0;
+				get_quote_id_arg((QUOTE)pat,&pid,&parg);
+				get_quote_id_arg((QUOTE)f,&id,&farg);
+				return quote_unify_node(farg,parg,rp);
 		}
 	}
 }
@@ -1560,7 +1620,12 @@ 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;