===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/primitive.c,v
retrieving revision 1.12
retrieving revision 1.15
diff -u -p -r1.12 -r1.15
--- OpenXM/src/kan96xx/Kan/primitive.c	2004/09/11 01:00:42	1.12
+++ OpenXM/src/kan96xx/Kan/primitive.c	2004/09/12 10:22:50	1.15
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/primitive.c,v 1.11 2003/12/05 23:14:14 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/primitive.c,v 1.14 2004/09/12 08:55:36 takayama Exp $ */
 /*   primitive.c */
 /*  The functions in this module were in stackmachine.c */
 
@@ -424,6 +424,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 +444,8 @@ int executePrimitive(ob) 
   extern TimerOn;
   extern SecureMode;
 
+  infixOn = 0;
+
   if (DebugStack >= 2) {
     fprintf(Fstack,"In execute %d\n",ob.lc.ival); printOperandStack();
   }
@@ -740,18 +744,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. */
     }
@@ -789,25 +784,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:  ;
@@ -838,12 +825,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("]");*/
@@ -892,14 +875,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:
@@ -909,14 +887,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 */    
@@ -1496,17 +1467,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 */
@@ -1543,6 +1509,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++) {
@@ -1550,7 +1519,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;
@@ -1578,7 +1558,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;
@@ -1598,14 +1579,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;
 
@@ -1650,13 +1624,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. */
     }
@@ -1724,24 +1692,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);