===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/primitive.c,v
retrieving revision 1.16
retrieving revision 1.18
diff -u -p -r1.16 -r1.18
--- OpenXM/src/kan96xx/Kan/primitive.c	2004/09/12 10:58:28	1.16
+++ OpenXM/src/kan96xx/Kan/primitive.c	2004/09/17 02:42:57	1.18
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/primitive.c,v 1.15 2004/09/12 10:22:50 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/primitive.c,v 1.17 2004/09/16 02:22:03 takayama Exp $ */
 /*   primitive.c */
 /*  The functions in this module were in stackmachine.c */
 
@@ -446,6 +446,7 @@ int executePrimitive(ob) 
   extern struct ring *CurrentRingp;
   extern TimerOn;
   extern SecureMode;
+  extern int RestrictedMode;
 
   infixOn = 0;
 
@@ -453,6 +454,18 @@ int executePrimitive(ob) 
     fprintf(Fstack,"In execute %d\n",ob.lc.ival); printOperandStack();
   }
 
+  if (RestrictedMode) {
+    switch(ob.lc.ival) {
+    case SleftBrace:
+    case SrightBrace:
+    case Sexec:
+      break;
+    default:
+      fprintf(stderr,"primitive No = %d : ", ob.lc.ival);
+      errorStackmachine("You cannot use this primitive in the RestrictedMode.\n");
+    }
+  }
+
   if (GotoP) return(0);
   switch (ob.lc.ival) {
     /* Postscript primitives :stack */
@@ -617,6 +630,8 @@ int executePrimitive(ob) 
     /* Or;  [[a_00 ....] [a_10 ....] ....] [1 0] any put. MultiIndex. */
     ob1 = Kpop(); ob2 = Kpop(); ob3 = Kpop();
     switch(ob2.tag) {
+    case SuniversalNumber:
+      ob2 = Kto_int32(ob2); /* do not break and go to Sinteger */ 
     case Sinteger: 
       switch(ob3.tag) {
       case Sarray:
@@ -651,6 +666,7 @@ int executePrimitive(ob) 
         if (ob5.tag != Sarray)
           errorStackmachine("Object pointed by the multi-index is not array (put)\n");
         ob4 = getoa(ob2,i);
+        if (ob4.tag == SuniversalNumber) ob4 = Kto_int32(ob4);
         if (ob4.tag != Sinteger)
           errorStackmachine("Index has to be an integer. (put)\n");
         k = ob4.lc.ival;