===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/list.c,v
retrieving revision 1.5
retrieving revision 1.11
diff -u -p -r1.5 -r1.11
--- OpenXM_contrib2/asir2000/builtin/list.c	2003/01/16 16:20:12	1.5
+++ OpenXM_contrib2/asir2000/builtin/list.c	2006/03/16 10:08:20	1.11
@@ -45,21 +45,29 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/builtin/list.c,v 1.4 2003/01/16 04:44:19 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/list.c,v 1.10 2004/08/25 05:43:35 ohara Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
 
-void Pcar(), Pcdr(), Pcons(), Pappend(), Pconcat(), Preverse(), Plength();
+void Pcar(), Pcdr(), Pcons(), Pappend(), Preverse(), Plength();
+void Plist(), Passoc(), Pcadr(), Pcddr();
+void Pnconc(), Preplcd(), Preplca();
 
 struct ftab list_tab[] = {
 	{"car",Pcar,1},
 	{"cdr",Pcdr,1},
 	{"cons",Pcons,2},
 	{"append",Pappend,2},
-	{"concat",Pconcat,2},
 	{"reverse",Preverse,1},
 	{"length",Plength,1},
+	{"nconc",Pnconc,2},
+	{"replcd",Preplcd,2},
+	{"replca",Preplca,2},
+	{"list", Plist, -99999999},
+	{"assoc",Passoc,2},
+	{"cddr",Pcddr,1},
+	{"cadr",Pcadr,1},
 	{0,0,0},
 };
 
@@ -85,6 +93,43 @@ LIST *rp;
 		MKLIST(*rp,NEXT(BDY((LIST)ARG0(arg))));
 }
 
+void Pcddr(arg,rp)
+NODE arg;
+LIST *rp;
+{
+    NODE n;
+    asir_assert(ARG0(arg),O_LIST,"cddr");
+    if ( !BDY((LIST)ARG0(arg)) ) {
+        *rp = (LIST)ARG0(arg);
+    }else {
+        n = NEXT(BDY((LIST)ARG0(arg)));
+        if ( n ) {
+            n = NEXT(n);
+        }
+        MKLIST(*rp,n);
+    }
+}
+
+void Pcadr(arg,rp)
+NODE arg;
+pointer *rp;
+{
+    NODE n;
+    LIST t;
+    asir_assert(ARG0(arg),O_LIST,"cadr");
+    if ( !BDY((LIST)ARG0(arg)) ) {
+        *rp = ARG0(arg);
+    }else {
+        n = NEXT(BDY((LIST)ARG0(arg)));
+        if ( n ) {
+            *rp = (pointer)BDY(n);
+        }else {
+            MKLIST(t,n);
+            *rp = t;
+        }
+    }
+}
+
 void Pcons(arg,rp)
 NODE arg;
 LIST *rp;
@@ -114,15 +159,61 @@ LIST *rp;
 	}
 }
 
-void Pconcat(arg,rp)
+void Preverse(arg,rp)
 NODE arg;
 LIST *rp;
 {
+	NODE t,t1,n;
+
+	asir_assert(ARG0(arg),O_LIST,"reverse");
+	if ( !(n = BDY((LIST)ARG0(arg))) )
+		*rp = (LIST)ARG0(arg);
+	else {
+		for ( t = 0; n; n = NEXT(n) ) {
+			MKNODE(t1,BDY(n),t); t = t1;
+		}
+		MKLIST(*rp,t);
+	}
+}
+
+void Plength(arg,rp)
+NODE arg;
+Q *rp;
+{
+    NODE n;
+    int i;
+
+    switch (OID(ARG0(arg))) {
+    case O_VECT:
+        i = ((VECT)ARG0(arg))->len;
+        break;
+    case O_LIST:
+        n = BDY((LIST)ARG0(arg));
+        for ( i = 0; n; i++, n = NEXT(n) );
+        break;
+	case O_BYTEARRAY:
+		i = ((BYTEARRAY)ARG0(arg))->len;
+		break;
+    default:
+        error("length : invalid argument"); break;
+    }
+    STOQ(i,*rp);
+}
+
+void Plist(NODE arg, LIST *rp)
+{
+    MKLIST(*rp,arg);
+}
+
+void Pnconc(arg,rp)
+NODE arg;
+LIST *rp;
+{
 	NODE a1,a2,n;
 
-	asir_assert(ARG0(arg),O_LIST,"concat");
-	asir_assert(ARG1(arg),O_LIST,"concat");
-	a1 = (LIST)ARG0(arg);
+	asir_assert(ARG0(arg),O_LIST,"nconc");
+	asir_assert(ARG1(arg),O_LIST,"nconc");
+	a1 = BDY((LIST)ARG0(arg));
 	if ( !a1 )
 		*rp = (LIST)ARG1(arg);
 	else {
@@ -130,36 +221,58 @@ LIST *rp;
 			a2 = n;
 		}
 		NEXT(a2) = BDY((LIST)ARG1(arg));
-		*rp = (LIST)a1;
+		*rp = (LIST)ARG0(arg);
 	}
 }
 
-void Preverse(arg,rp)
+void Preplcd(arg,rp)
 NODE arg;
 LIST *rp;
 {
-	NODE t,t1,n;
-
-	asir_assert(ARG0(arg),O_LIST,"reverse");
-	if ( !(n = BDY((LIST)ARG0(arg))) )
+	NODE a0,a1;
+	
+	asir_assert(ARG0(arg),O_LIST,"replcd");
+	asir_assert(ARG1(arg),O_LIST,"replcd");
+	a0 = BDY((LIST)ARG0(arg));
+	if ( !a0 )
 		*rp = (LIST)ARG0(arg);
 	else {
-		for ( t = 0; n; n = NEXT(n) ) {
-			MKNODE(t1,BDY(n),t); t = t1;
-		}
-		MKLIST(*rp,t);
+		NEXT(a0) = BDY((LIST)ARG1(arg));
+		*rp = (LIST)ARG0(arg);
 	}
 }
 
-void Plength(arg,rp)
+void Preplca(arg,rp)
 NODE arg;
-Q *rp;
+LIST *rp;
 {
 	NODE n;
-	int i;
+	
+	asir_assert(ARG0(arg),O_LIST,"replca");
+	if ( !(n = BDY((LIST)ARG0(arg)) ) )
+		*rp = (LIST)ARG0(arg);
+	else {
+		BDY(BDY((LIST)ARG0(arg))) = (LIST)ARG1(arg);
+		*rp = (LIST)ARG0(arg);
+	}
+}
 
-	asir_assert(ARG0(arg),O_LIST,"length");
-	n = BDY((LIST)ARG0(arg));
-	for ( i = 0; n; i++, n = NEXT(n) );
-	STOQ(i,*rp);
+void Passoc(NODE arg, LIST *rp)
+{
+    NODE n,m,s1,t1,t2;
+    LIST s,t;
+
+    asir_assert(ARG0(arg),O_LIST,"assoc");
+    asir_assert(ARG1(arg),O_LIST,"assoc");
+    n = BDY((LIST)ARG0(arg));
+    m = BDY((LIST)ARG1(arg));
+    for ( s = 0, t2 = 0; n; n = NEXT(n) ) {
+        if (m) {
+            MKNODE(t2,BDY(m),0);
+            m = NEXT(m);
+        }
+        MKNODE(t1,BDY(n),t2); MKLIST(t,t1);
+        NEXTNODE(s,s1); BDY(s1) = t; NEXT(s1) = 0;
+    }
+    MKLIST(*rp,s);
 }