=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/list.c,v retrieving revision 1.6 retrieving revision 1.8 diff -u -p -r1.6 -r1.8 --- OpenXM_contrib2/asir2000/builtin/list.c 2003/01/20 17:44:51 1.6 +++ OpenXM_contrib2/asir2000/builtin/list.c 2004/06/22 13:40:44 1.8 @@ -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.7 2003/07/29 01:50:56 ohara Exp $ */ #include "ca.h" #include "parse.h" void Pcar(), Pcdr(), Pcons(), Pappend(), Preverse(), Plength(); +void Plist(); void Pnconc(), Preplcd(), Preplca(); struct ftab list_tab[] = { @@ -63,6 +64,7 @@ struct ftab list_tab[] = { {"nconc",Pnconc,2}, {"replcd",Preplcd,2}, {"replca",Preplca,2}, + {"list", Plist, -99999999}, {0,0,0}, }; @@ -138,13 +140,26 @@ 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; + default: + error("length : invalid argument"); break; + } + STOQ(i,*rp); +} + +void Plist(NODE arg, LIST *rp) +{ + MKLIST(*rp,arg); } void Pnconc(arg,rp)