===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/list.c,v
retrieving revision 1.2
retrieving revision 1.12
diff -u -p -r1.2 -r1.12
--- OpenXM_contrib2/asir2000/builtin/list.c	2000/08/21 08:31:20	1.2
+++ OpenXM_contrib2/asir2000/builtin/list.c	2018/03/29 01:32:50	1.12
@@ -23,7 +23,7 @@
  * shall be made on your publication or presentation in any form of the
  * results obtained by use of the SOFTWARE.
  * (4) In the event that you modify the SOFTWARE, you shall notify FLL by
- * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification
+ * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification
  * for such modification or the source code of the modified part of the
  * SOFTWARE.
  * 
@@ -45,100 +45,234 @@
  * 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.1.1.1 1999/12/03 07:39:07 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/builtin/list.c,v 1.11 2006/03/16 10:08:20 noro 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[] = {
-	{"car",Pcar,1},
-	{"cdr",Pcdr,1},
-	{"cons",Pcons,2},
-	{"append",Pappend,2},
-	{"reverse",Preverse,1},
-	{"length",Plength,1},
-	{0,0,0},
+  {"car",Pcar,1},
+  {"cdr",Pcdr,1},
+  {"cons",Pcons,2},
+  {"append",Pappend,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},
 };
 
 void Pcar(arg,rp)
 NODE arg;
 pointer *rp;
 {
-	asir_assert(ARG0(arg),O_LIST,"car");
-	if ( !BDY((LIST)ARG0(arg)) )
-		*rp = ARG0(arg);
-	else
-		*rp = (pointer)BDY(BDY((LIST)ARG0(arg)));
+  asir_assert(ARG0(arg),O_LIST,"car");
+  if ( !BDY((LIST)ARG0(arg)) )
+    *rp = ARG0(arg);
+  else
+    *rp = (pointer)BDY(BDY((LIST)ARG0(arg)));
 }
 
 void Pcdr(arg,rp)
 NODE arg;
 LIST *rp;
 {
-	asir_assert(ARG0(arg),O_LIST,"cdr");
-	if ( !BDY((LIST)ARG0(arg)) )
-		*rp = (LIST)ARG0(arg);
-	else 
-		MKLIST(*rp,NEXT(BDY((LIST)ARG0(arg))));
+  asir_assert(ARG0(arg),O_LIST,"cdr");
+  if ( !BDY((LIST)ARG0(arg)) )
+    *rp = (LIST)ARG0(arg);
+  else 
+    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;
 {
-	NODE t;
+  NODE t;
 
-	asir_assert(ARG1(arg),O_LIST,"cons");
-	MKNODE(t,ARG0(arg),BDY((LIST)ARG1(arg))); MKLIST(*rp,t);
+  asir_assert(ARG1(arg),O_LIST,"cons");
+  MKNODE(t,ARG0(arg),BDY((LIST)ARG1(arg))); MKLIST(*rp,t);
 }
 
 void Pappend(arg,rp)
 NODE arg;
 LIST *rp;
 {
-	NODE t,t0,n;
+  NODE t,t0,n;
 
-	asir_assert(ARG0(arg),O_LIST,"append");
-	asir_assert(ARG1(arg),O_LIST,"append");
-	if ( !(n = BDY((LIST)ARG0(arg))) )
-		*rp = (LIST)ARG1(arg);
-	else {
-		for ( t0 = 0; n; n = NEXT(n) ) {
-			NEXTNODE(t0,t); BDY(t) = BDY(n);
-		}
-		NEXT(t) = BDY((LIST)ARG1(arg));
-		MKLIST(*rp,t0);
-	}
+  asir_assert(ARG0(arg),O_LIST,"append");
+  asir_assert(ARG1(arg),O_LIST,"append");
+  if ( !(n = BDY((LIST)ARG0(arg))) )
+    *rp = (LIST)ARG1(arg);
+  else {
+    for ( t0 = 0; n; n = NEXT(n) ) {
+      NEXTNODE(t0,t); BDY(t) = BDY(n);
+    }
+    NEXT(t) = BDY((LIST)ARG1(arg));
+    MKLIST(*rp,t0);
+  }
 }
 
 void Preverse(arg,rp)
 NODE arg;
 LIST *rp;
 {
-	NODE t,t1,n;
+  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);
-	}
+  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;
+    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;
+{
+  NODE a1,a2,n;
+
+  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 {
+    for ( n = a1; n; n = NEXT(n) ) {
+      a2 = n;
+    }
+    NEXT(a2) = BDY((LIST)ARG1(arg));
+    *rp = (LIST)ARG0(arg);
+  }
+}
+
+void Preplcd(arg,rp)
+NODE arg;
+LIST *rp;
+{
+  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 {
+    NEXT(a0) = BDY((LIST)ARG1(arg));
+    *rp = (LIST)ARG0(arg);
+  }
+}
+
+void Preplca(arg,rp)
+NODE arg;
+LIST *rp;
+{
+  NODE n;
+  
+  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);
+  }
+}
+
+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);
 }