===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/kanExport0.c,v
retrieving revision 1.36
retrieving revision 1.42
diff -u -p -r1.36 -r1.42
--- OpenXM/src/kan96xx/Kan/kanExport0.c	2004/09/16 02:22:03	1.36
+++ OpenXM/src/kan96xx/Kan/kanExport0.c	2005/06/09 05:46:57	1.42
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.35 2004/09/15 06:40:26 takayama Exp $  */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/kanExport0.c,v 1.41 2004/11/15 08:27:27 takayama Exp $  */
 #include <stdio.h>
 #include "datatype.h"
 #include "stackm.h"
@@ -1041,6 +1041,9 @@ struct object KdataConversion(obj,key)
     }else if (strcmp(key,"null") == 0) {
       rob = NullObject;
       return(rob);
+    }else if (strcmp(key,"byteArray") == 0) {
+      rob = newByteArray(getoaSize(obj),obj);
+      return(rob);
     }else {
 	  { /* Automatically maps the elements. */
 		int n,i;
@@ -1218,6 +1221,14 @@ struct object KdataConversion(obj,key)
       warningKan("Sorryl This type of data conversion of ringp has not supported yet.\n");
     }
     break;
+  case SbyteArray:
+    if (strcmp(key,"array") == 0) {
+      rob = byteArrayToArray(obj);
+      return(rob);
+    } else {
+      warningKan("Sorryl This type of data conversion of ringp has not supported yet.\n");
+    }
+    break;
   default:
     warningKan("Sorry. This type of data conversion has not supported yet.\n");
   }
@@ -1511,7 +1522,7 @@ int KsetUpRing(ob1,ob2,ob3,ob4,ob5)
         ob4 = Order matrix
         ob5 = [(keyword) value (keyword) value ....]
      */
-#define RP_LIMIT 500
+#define RP_LIMIT 5000
 {
   int i;
   struct object ob;
@@ -3067,11 +3078,166 @@ struct object Kget(struct object ob1, struct object ob
       ob1 = rob;
     }
     return Kcar(ob1);
+  } else if (ob1.tag == SbyteArray) {
+    size = getByteArraySize(ob1);
+    if ((0 <= i) && (i<size)) {
+      return(KpoInteger(KopByteArray(ob1)[i]));
+    }else{
+      errorKan1("%s\n","Kget: Index is out of bound. (get)\n");
+    }
+  } else if (ob1.tag == Sdollar) {
+    unsigned char *sss;
+    sss = (unsigned char *) KopString(ob1);
+    size = strlen(sss);
+    if ((0 <= i) && (i<size)) {
+      return(KpoInteger(sss[i]));
+    }else{
+      errorKan1("%s\n","Kget: Index is out of bound. (get)\n");
+    }
+
   }else errorKan1("%s\n","Kget: argument must be an array or a list.");
 }
 
+/* Constructor of byteArray */
+struct object newByteArray(int size,struct object obj) {
+  unsigned char *ba;
+  unsigned char *ba2;
+  struct object rob,tob;
+  int i,n;
+  ba = NULL;
+  if (size > 0) {
+    ba = (unsigned char *) sGC_malloc(size);
+    if (ba == NULL) errorKan1("%s\n","No more memory.");
+  }
+  rob.tag = SbyteArray; rob.lc.bytes = ba; rob.rc.ival = size;
+  if (obj.tag == SbyteArray) {
+    n = getByteArraySize(obj);
+    ba2 = KopByteArray(obj);
+    for (i=0; i<(n<size?n:size); i++) {
+      ba[i] = ba2[i];
+    }
+    for (i=n; i<size; i++) ba[i] = 0;
+    return rob;
+  }else if (obj.tag == Sarray) {
+    n = getoaSize(obj);
+    for (i=0; i<n; i++) {
+      tob = getoa(obj,i);
+      tob = Kto_int32(tob);
+      if (tob.tag != Sinteger) errorKan1("%s\n","newByteArray: array is not an array of integer or universalNumber.");
+      ba[i] = (unsigned char) KopInteger(tob);
+    }
+    for (i=n; i<size; i++) ba[i] = 0;
+    return rob;
+  }else{
+    for (i=0; i<size; i++) ba[i] = 0;
+    return rob;
+  }
+}
+struct object newByteArrayFromStr(char *s,int size) {
+  unsigned char *ba;
+  struct object rob;
+  int i;
+  ba = NULL;
+  if (size > 0) {
+    ba = (unsigned char *) sGC_malloc(size);
+    if (ba == NULL) errorKan1("%s\n","No more memory.");
+  }
+  rob.tag = SbyteArray; rob.lc.bytes = ba; rob.rc.ival = size;
+  for (i=0; i<size; i++) {
+	ba[i] = (char) s[i];
+  }
+  return(rob);
+}
+
+struct object byteArrayToArray(struct object obj) {
+  int n,i; unsigned char *ba;
+  struct object rob;
+  if (obj.tag != SbyteArray) errorKan1("%s\n","byteArrayToArray: argument is not an byteArray.");
+  n = getByteArraySize(obj);
+  rob = newObjectArray(n);
+  ba = KopByteArray(obj);
+  for (i=0; i<n; i++) putoa(rob,i,KpoInteger((int) ba[i]));
+  return rob;
+}
+
+struct object KgetAttributeList(struct object ob){
+  struct object rob;
+  if (ob.attr != NULL) rob = *(ob.attr);
+  else rob = NullObject;
+  return rob;
+}
+struct object  KputAttributeList(struct object ob,struct object attr) {
+  ob.attr = newObject();
+  *(ob.attr) = attr;
+  return ob;
+}
+struct object KgetAttribute(struct object ob,struct object key) {
+  struct object rob;
+  struct object alist;
+  int n,i;
+  struct object tob;
+  char *s;
+  rob = NullObject;
+  if (ob.attr == NULL) return rob;
+  alist = *(ob.attr);
+  if (alist.tag != Sarray) return rob;
+  if (key.tag != Sdollar) return rob;
+  s = KopString(key);
+  n = getoaSize(alist);
+  for (i = 0; i < n; i += 2) {
+    tob = getoa(alist,i);
+    if (tob.tag == Sdollar) {
+      if (strcmp(KopString(tob),s) == 0) {
+        if (i+1 < n) rob = getoa(alist,i+1);
+        return rob;
+      }
+    }
+  }
+  return rob;
+}
+/*  ob (key) (value) putAttribute /ob set. They are not destructive. */
+struct object KputAttribute(struct object ob,struct object key,struct object value) {
+  struct object rob;
+  struct object alist;
+  int n,i;
+  char *s = "";
+  struct object tob;
+  rob = ob;
+  if (ob.attr == NULL) {
+    rob.attr = newObject();
+    *(rob.attr) = newObjectArray(2);
+    putoa((*(rob.attr)),0,key);
+    putoa((*(rob.attr)),1,value);
+    return rob;
+  }
+  alist = *(ob.attr);
+  if (alist.tag != Sarray) return rob;
+  if (key.tag != Sdollar) {
+    s = KopString(key);
+  }
+  n = getoaSize(alist);
+  for (i = 0; i < n; i += 2) {
+    tob = getoa(alist,i);
+    if (tob.tag == Sdollar) {
+      if (strcmp(KopString(tob),s) == 0) {
+        if (i+1 < n) putoa(alist,i+1,value);
+        return rob;
+      }
+    }
+  }
+
+  rob.attr = newObject();
+  *(rob.attr) = newObjectArray(n+2);
+  for (i=0; i<n; i++) {
+    putoa((*(rob.attr)),i,getoa((*(ob.attr)),i));
+  }
+  putoa((*(rob.attr)),n,key);
+  putoa((*(rob.attr)),n+1,value);
+  return rob;
+}
+
 /******************************************************************
-     error handler
+     Error handler
 ******************************************************************/
 
 errorKan1(str,message)
@@ -3081,7 +3247,9 @@ errorKan1(str,message)
   extern char *GotoLabel;
   extern int GotoP;
   extern int ErrorMessageMode;
+  extern int RestrictedMode, RestrictedMode_saved;
   char tmpc[1024];
+  RestrictedMode = RestrictedMode_saved;
   cancelAlarm();
   if (ErrorMessageMode == 1 || ErrorMessageMode == 2) {
     sprintf(tmpc,"\nERROR(kanExport[0|1].c): ");