===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/list.c,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -p -r1.6 -r1.11
--- OpenXM_contrib2/asir2000/builtin/list.c	2003/01/20 17:44:51	1.6
+++ OpenXM_contrib2/asir2000/builtin/list.c	2006/03/16 10:08:20	1.11
@@ -45,12 +45,13 @@
  * 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.5 2003/01/16 16:20:12 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(), Preverse(), Plength();
+void Plist(), Passoc(), Pcadr(), Pcddr();
 void Pnconc(), Preplcd(), Preplca();
 
 struct ftab list_tab[] = {
@@ -63,6 +64,10 @@ struct ftab list_tab[] = {
 	{"nconc",Pnconc,2},
 	{"replcd",Preplcd,2},
 	{"replca",Preplca,2},
+	{"list", Plist, -99999999},
+	{"assoc",Passoc,2},
+	{"cddr",Pcddr,1},
+	{"cadr",Pcadr,1},
 	{0,0,0},
 };
 
@@ -88,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;
@@ -138,15 +180,31 @@ void Plength(arg,rp)
 NODE arg;
 Q *rp;
 {
-	NODE n;
-	int i;
+    NODE n;
+    int i;
 
-	asir_assert(ARG0(arg),O_LIST,"length");
-	n = BDY((LIST)ARG0(arg));
-	for ( i = 0; n; i++, n = NEXT(n) );
-	STOQ(i,*rp);
+    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;
@@ -197,4 +255,24 @@ LIST *rp;
 		BDY(BDY((LIST)ARG0(arg))) = (LIST)ARG1(arg);
 		*rp = (LIST)ARG0(arg);
 	}
+}
+
+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);
 }