===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/primitive.c,v
retrieving revision 1.10
retrieving revision 1.17
diff -u -p -r1.10 -r1.17
--- OpenXM/src/kan96xx/Kan/primitive.c	2003/12/05 13:51:31	1.10
+++ OpenXM/src/kan96xx/Kan/primitive.c	2004/09/16 02:22:03	1.17
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/primitive.c,v 1.9 2003/12/03 01:21:43 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/primitive.c,v 1.16 2004/09/12 10:58:28 takayama Exp $ */
 /*   primitive.c */
 /*  The functions in this module were in stackmachine.c */
 
@@ -40,6 +40,9 @@ static char *operatorType(type)
  return("Unknown operator");
 }
 
+#define evalEA(ob1) if (ob1.tag == SexecutableArray) {\
+	  executeExecutableArray(ob1,(char *)NULL,0); ob1 = Kpop();}
+
 /****** primitive functions *****************************************
   the values must be greater than 1. 0 is used for special purposes.*/
 #define Sadd              1
@@ -424,6 +427,8 @@ int executePrimitive(ob) 
   int size;
   int i,j,k,n;
   int status;
+  int infixOn;
+  struct tokens infixToken;
   struct tokens *tokenArray;
   struct tokens token;
   FILE *fp;
@@ -442,6 +447,8 @@ int executePrimitive(ob) 
   extern TimerOn;
   extern SecureMode;
 
+  infixOn = 0;
+
   if (DebugStack >= 2) {
     fprintf(Fstack,"In execute %d\n",ob.lc.ival); printOperandStack();
   }
@@ -536,31 +543,36 @@ int executePrimitive(ob) 
 
     /* Postscript primitives :arithmetic */
   case Sadd:
-    ob1 = Kpop();
+    ob1 = Kpop();  
     ob2 = Kpop();
+    evalEA(ob1); evalEA(ob2);
     rob = KooAdd(ob1,ob2);
     Kpush(rob);
     break;
   case Ssub:
     ob2 = Kpop();
     ob1 = Kpop();
+    evalEA(ob1); evalEA(ob2);
     rob = KooSub(ob1,ob2);
     Kpush(rob);
     break;
   case Smult:
     ob2 = Kpop();
     ob1 = Kpop();
+    evalEA(ob1); evalEA(ob2);
     rob = KooMult(ob1,ob2);
     Kpush(rob);
     break;
   case Sidiv:
     ob2 = Kpop(); ob1 = Kpop();
+    evalEA(ob1); evalEA(ob2);
     rob = KooDiv(ob1,ob2);
     Kpush(rob);
     break;
 
   case Sdiv:
     ob2 = Kpop(); ob1 = Kpop();
+    evalEA(ob1); evalEA(ob2);
     rob = KooDiv2(ob1,ob2);
     Kpush(rob);
     break;
@@ -596,21 +608,7 @@ int executePrimitive(ob) 
     /* ob2               ob1 get     */
     ob1 = Kpop();
     ob2 = Kpop();
-    switch(ob2.tag) {
-    case Sarray: break;
-    default: errorStackmachine("Usage:get");
-    }
-    switch(ob1.tag) {
-    case Sinteger: break;
-    default: errorStackmachine("Usage:get");
-    }
-    i =ob1.lc.ival;
-    size = getoaSize(ob2);
-    if ((0 <= i) && (i<size)) {
-      Kpush(getoa(ob2,i));
-    }else{
-      errorStackmachine("Index is out of bound. (get)\n");
-    }
+    Kpush(Kget(ob2,ob1));
     break;
 
   case Sput:
@@ -619,6 +617,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:
@@ -653,6 +653,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;
@@ -754,18 +755,9 @@ int executePrimitive(ob) 
       errorStackmachine("Usage:loop");
       break;
     }
-    tokenArray = ob1.lc.tokenArray;
-    size = ob1.rc.ival;
-    i = 0;
     while (1) {
-      token = tokenArray[i];
-      /***printf("[token %d]%s\n",i,token.token);*/
-      i++;
-      if (i >= size) {
-        i=0;
-      }
-      status = executeToken(token);
-      if (status || GotoP) break;
+      status = executeExecutableArray(ob1,(char *)NULL,1);
+      if ((status & STATUS_BREAK) || GotoP) break;
       /* here, do not return 1. Do not propagate exit signal outside of the
          loop. */
     }
@@ -803,25 +795,17 @@ int executePrimitive(ob) 
         */
         for ( ; i<=lim; i += inc) {
           Kpush(KpoInteger(i));
-          tokenArray = ob1.lc.tokenArray;
-          size = ob1.rc.ival;
-          for (j=0; j<size; j++) {
-            status = executeToken(tokenArray[j]);
-            if (status || GotoP) goto xyz;
-          }
-        }
+          status = executeExecutableArray(ob1,(char *)NULL,1);
+          if ((status & STATUS_BREAK) || GotoP) goto xyz;
+		}
       }else{
         /*
           if (lim > i) errorStackmachine("The initial value must not be less than limit value (for).\n");
         */
         for ( ; i>=lim; i += inc) {
           Kpush(KpoInteger(i));
-          tokenArray = ob1.lc.tokenArray;
-          size = ob1.rc.ival;
-          for (j=0; j<size; j++) {
-            status = executeToken(tokenArray[j]);
-            if (status || GotoP) goto xyz;
-          }
+          status = executeExecutableArray(ob1,(char *)NULL,1);
+          if ((status & STATUS_BREAK) || GotoP) goto xyz;
         }
       }
     xyz:  ;
@@ -852,12 +836,8 @@ int executePrimitive(ob) 
 
     for (i=0; i<osize; i++) {
       Kpush(getoa(ob1,i));
-      tokenArray = ob2.lc.tokenArray;
-      size = ob2.rc.ival;
-      for (j=0; j<size; j++) {
-        status = executeToken(tokenArray[j]);
-        if (status) goto foor;
-      }
+      status = executeExecutableArray(ob2,(char *)NULL,0);
+      if (status & STATUS_BREAK) goto foor;
     }
     foor: ;
     /*KSexecuteString("]");*/
@@ -906,14 +886,9 @@ int executePrimitive(ob) 
       ob1 = ob2;
     }
     /* execute ob1 */
-    tokenArray = ob1.lc.tokenArray;
-    size = ob1.rc.ival;
-    for (i=0; i<size; i++) {
-      token = tokenArray[i];
-      status = executeToken(token);
-      if (status != 0) return(status);
-    }
-    
+    status = executeExecutableArray(ob1,(char *)NULL,0);
+    if (status & STATUS_BREAK) return(status);
+
     break;
 
   case Sexec:
@@ -923,14 +898,7 @@ int executePrimitive(ob) 
     case SexecutableArray: break;
     default: errorStackmachine("Usage:exec");
     }
-    tokenArray = ob1.lc.tokenArray;
-    size = ob1.rc.ival;
-    for (i=0; i<size; i++) {
-      token = tokenArray[i];
-      /***printf("[token %d]%s\n",i,token.token);*/
-      status = executeToken(token);
-      if (status != 0) break;
-    }
+	status = executeExecutableArray(ob1,(char *)NULL,0);
     break;
 
     /* Postscript primitives :dictionary */    
@@ -1510,17 +1478,12 @@ int executePrimitive(ob) 
     }
     /* normal exec. */ 
     Kpush(ob2);
-    tokenArray = ob1.lc.tokenArray;
-    size = ob1.rc.ival;
-    for (i=0; i<size; i++) {
-      token = tokenArray[i];
-      status = executeToken(token);
-      if (status != 0) break;
-    }
+    status = executeExecutableArray(ob1,(char *)NULL,0);
+
     if (ccflag) {
       contextControl(CCPOP); ccflag = 0; /* recover the Current context. */
     }
-    
+
     break;
   case Ssendmsg2:
     /* ob2 ob4 { .........} sendmsg2 */
@@ -1557,6 +1520,9 @@ int executePrimitive(ob) 
     }
     /* normal exec. */ 
     Kpush(ob2); Kpush(ob4);
+
+    /* We cannot use executeExecutableArray(ob1,(char *)NULL) because of
+       the quote mode. Think about it later. */
     tokenArray = ob1.lc.tokenArray;
     size = ob1.rc.ival;
     for (i=0; i<size; i++) {
@@ -1564,7 +1530,18 @@ int executePrimitive(ob) 
       InSendmsg2 = 1;
       status = executeToken(token);
       InSendmsg2 = 0;
-      if (QuoteMode && (status==DO_QUOTE)) {
+
+      if (status & STATUS_INFIX) {
+		if (status & DO_QUOTE) errorStackmachine("infix op with DO_QUOTE\n");
+        if (i == size-1) errorStackmachine("infix operator at the end(sendmsg2).\n");
+        infixOn = 1; infixToken = tokenArray[i];
+        infixToken.tflag |= NO_DELAY; continue;
+      }else if (infixOn) {
+        infixOn = 0; status = executeToken(infixToken);
+        if (status & STATUS_BREAK) break;
+      }
+
+      if (QuoteMode && (status & DO_QUOTE)) {
         /* generate tree object, for kan/k0 */
         struct object qob;
         struct object qattr;
@@ -1580,10 +1557,11 @@ int executePrimitive(ob) 
           putoa(qob,0,KpoString("unknown"));
         }
         /* Set the attibute list; class=className */
-        putoa(qattr2,0,KpoString("class"));
         if (ob2.tag == Sdollar) {
+          putoa(qattr2,0,KpoString("cd"));
           putoa(qattr2,1,ob2);
         }else{
+          putoa(qattr2,0,KpoString("class"));
           putoa(qattr2,1,KpoString(CurrentContextp->contextName));
         }
         putoa(qattr,0,qattr2);
@@ -1591,7 +1569,8 @@ int executePrimitive(ob) 
         putoa(qob,2,ob4);  /* Argument */
         qob = KpoTree(qob);
         Kpush(qob);
-      } else if (status != 0) break;
+      } else if (status & STATUS_BREAK) break;
+
     }
     if (ccflag) {
       contextControl(CCPOP); ccflag = 0;
@@ -1611,14 +1590,7 @@ int executePrimitive(ob) 
     contextControl(CCPUSH); ccflag = 1;
     CurrentContextp = PrimitiveContextp;
     /* normal exec. */ 
-    tokenArray = ob1.lc.tokenArray;
-    size = ob1.rc.ival;
-    for (i=0; i<size; i++) {
-      token = tokenArray[i];
-      status = executeToken(token);
-      if (status != 0) break;
-    }
-
+    status = executeExecutableArray(ob1,(char *)NULL,0);
     contextControl(CCPOP); /* recover the Current context. */
     break;
 
@@ -1663,13 +1635,7 @@ int executePrimitive(ob) 
     }
     /* normal exec. */ 
     Kpush(ob2); Kpush(ob4);
-    tokenArray = ob1.lc.tokenArray;
-    size = ob1.rc.ival;
-    for (i=0; i<size; i++) {
-      token = tokenArray[i];
-      status = executeToken(token);
-      if (status != 0) break;
-    }
+    status = executeExecutableArray(ob1,(char *)NULL,0);
     if (ccflag) {
       contextControl(CCPOP); ccflag = 0; /* recover the Current context. */
     }
@@ -1737,24 +1703,15 @@ int executePrimitive(ob) 
       errorStackmachine("Usage:tlimit");
       break;
     }
-    tokenArray = ob1.lc.tokenArray;
-    size = ob1.rc.ival;
 	n = ob2.lc.ival;
-    i = 0;
 	if (n > 0) {
 	  signal(SIGALRM,ctrlC); alarm((unsigned int) n);
-	  for (i=0; i<size; i++) {
-		token = tokenArray[i];
-		status = executeToken(token);
-	  }
+      status = executeExecutableArray(ob1,(char *)NULL,0);
 	  cancelAlarm();
 	}else{
       before_real = time(&before_real);
       times(&before);
-	  for (i=0; i<size; i++) {
-		token = tokenArray[i];
-		status = executeToken(token);
-	  }
+      status = executeExecutableArray(ob1,(char *)NULL,0);
       times(&after);
       after_real = time(&after_real);
 	  ob1 = newObjectArray(3);