===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/kanExport0.c,v
retrieving revision 1.43
retrieving revision 1.46
diff -u -p -r1.43 -r1.46
--- OpenXM/src/kan96xx/Kan/kanExport0.c	2005/06/16 05:07:23	1.43
+++ OpenXM/src/kan96xx/Kan/kanExport0.c	2005/09/27 06:10:43	1.46
@@ -1,5 +1,7 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.42 2005/06/09 05:46:57 takayama Exp $  */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.45 2005/07/03 11:08:53 ohara Exp $  */
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "datatype.h"
 #include "stackm.h"
 #include "extern.h"
@@ -2267,6 +2269,56 @@ struct object KstringToArgv(struct object ob) {
   return(rob);
 }
 
+struct object KstringToArgv2(struct object ob,struct object oseparator) {
+  struct object rob = OINIT;
+  char *s;
+  int n,wc,i,inblank;
+  char **argv;
+  int separator;
+  if (ob.tag != Sdollar)
+    errorKan1("%s\n","KstringToArgv2(): the argument must be a string.");
+  if (oseparator.tag == Sinteger) {
+	separator = KopInteger(oseparator);
+  }else if (oseparator.tag == Sdollar) {
+	s = KopString(oseparator);
+	separator=s[0];
+  }else {
+    errorKan1("%s\n","KstringToArgv2(ob,separator):the argument must be strings.");
+  }
+  n = strlen(KopString(ob));
+  s = (char *) sGC_malloc(sizeof(char)*(n+2));
+  if (s == NULL) errorKan1("%s\n","KstringToArgv(): No memory.");
+  strcpy(s,KopString(ob));
+  inblank = 1;  wc = 0; 
+  for (i=0; i<n; i++) {
+    if (inblank && (s[i] != separator)) {
+      wc++; inblank = 0;
+    }else if ((!inblank) && (s[i] == separator)) {
+      inblank = 1;
+    }
+  }
+  argv = (char **) sGC_malloc(sizeof(char *)*(wc+2));
+  argv[0] = NULL;
+  inblank = 1;  wc = 0; 
+  for (i=0; i<n; i++) {
+    if (inblank && (s[i] != separator)) {
+      argv[wc] = &(s[i]); argv[wc+1]=NULL;
+      wc++; inblank = 0;
+    }else if ((inblank == 0) && (s[i] == separator)) {
+      inblank = 1; s[i] = 0;
+    }else if (inblank && (s[i] == separator)) {
+      s[i] = 0;
+    }
+  }
+
+  rob = newObjectArray(wc);
+  for (i=0; i<wc; i++) {
+    putoa(rob,i,KpoString(argv[i]));
+    /* printf("%s\n",argv[i]); */
+  }
+  return(rob);
+}
+
 static void checkDuplicateName(xvars,dvars,n)
      char *xvars[];
      char *dvars[];
@@ -3184,7 +3236,7 @@ struct object KgetAttributeList(struct object ob){
   else rob = NullObject;
   return rob;
 }
-struct object  KputAttributeList(struct object ob,struct object attr) {
+struct object  KsetAttributeList(struct object ob,struct object attr) {
   ob.attr = newObject();
   *(ob.attr) = attr;
   return ob;
@@ -3213,8 +3265,8 @@ struct object KgetAttribute(struct object ob,struct ob
   }
   return rob;
 }
-/*  ob (key) (value) putAttribute /ob set. They are not destructive. */
-struct object KputAttribute(struct object ob,struct object key,struct object value) {
+/*  ob (key) (value) setAttribute /ob set. They are not destructive. */
+struct object KsetAttribute(struct object ob,struct object key,struct object value) {
   struct object rob = OINIT;
   struct object alist = OINIT;
   int n,i;