===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/primitive.c,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -p -r1.10 -r1.13
--- OpenXM/src/kan96xx/Kan/primitive.c	2003/12/05 13:51:31	1.10
+++ OpenXM/src/kan96xx/Kan/primitive.c	2004/09/12 02:37:57	1.13
@@ -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.12 2004/09/11 01:00:42 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();
   }
@@ -596,21 +600,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:
@@ -765,9 +755,18 @@ int executePrimitive(ob) 
         i=0;
       }
       status = executeToken(token);
-      if (status || GotoP) break;
+      if ((status & STATUS_BREAK) || GotoP) break;
       /* here, do not return 1. Do not propagate exit signal outside of the
          loop. */
+	  
+      if (status & STATUS_INFIX) {
+        infixOn = 1; infixToken = token; 
+        infixToken.tflag |= NO_DELAY;  continue;
+      }else if (infixOn) {
+        infixOn = 0; status = executeToken(infixToken);
+        if ((status & STATUS_BREAK) || GotoP) break;
+      }
+
     }
     break;
 
@@ -807,9 +806,19 @@ int executePrimitive(ob) 
           size = ob1.rc.ival;
           for (j=0; j<size; j++) {
             status = executeToken(tokenArray[j]);
-            if (status || GotoP) goto xyz;
-          }
-        }
+            if ((status & STATUS_BREAK) || GotoP) goto xyz;
+
+            if (status & STATUS_INFIX) {
+              if (j == size-1) errorStackmachine("infix operator at the end.\n");
+              infixOn = 1; infixToken = tokenArray[j];
+              infixToken.tflag |= NO_DELAY; continue;
+            }else if (infixOn) {
+              infixOn = 0; status = executeToken(infixToken);
+              if ((status & STATUS_BREAK) || GotoP) goto xyz;
+            }
+
+		  }
+		}
       }else{
         /*
           if (lim > i) errorStackmachine("The initial value must not be less than limit value (for).\n");
@@ -820,7 +829,17 @@ int executePrimitive(ob) 
           size = ob1.rc.ival;
           for (j=0; j<size; j++) {
             status = executeToken(tokenArray[j]);
-            if (status || GotoP) goto xyz;
+            if ((status & STATUS_BREAK) || GotoP) goto xyz;
+
+            if (status & STATUS_INFIX) {
+              if (j == size-1) errorStackmachine("infix operator at the end.\n");
+              infixOn = 1; infixToken = tokenArray[j];
+              infixToken.tflag |= NO_DELAY; continue;
+            }else if (infixOn) {
+              infixOn = 0; status = executeToken(infixToken);
+              if ((status & STATUS_BREAK) || GotoP) goto xyz;
+			}
+
           }
         }
       }
@@ -856,7 +875,17 @@ int executePrimitive(ob) 
       size = ob2.rc.ival;
       for (j=0; j<size; j++) {
         status = executeToken(tokenArray[j]);
-        if (status) goto foor;
+        if (status & STATUS_BREAK) goto foor;
+
+        if (status & STATUS_INFIX) {
+          if (j == size-1) errorStackmachine("infix operator at the end(map).\n");
+          infixOn = 1; infixToken = tokenArray[j];
+          infixToken.tflag |= NO_DELAY; continue;
+        }else if (infixOn) {
+          infixOn = 0; status = executeToken(infixToken);
+          if ((status & STATUS_BREAK) || GotoP) goto foor;
+        }
+
       }
     }
     foor: ;
@@ -911,7 +940,17 @@ int executePrimitive(ob) 
     for (i=0; i<size; i++) {
       token = tokenArray[i];
       status = executeToken(token);
-      if (status != 0) return(status);
+      if (status & STATUS_BREAK) return(status);
+
+      if (status & STATUS_INFIX) {
+        if (i == size-1) errorStackmachine("infix operator at the end(if).\n");
+        infixOn = 1; infixToken = tokenArray[i];
+        infixToken.tflag |= NO_DELAY; continue;
+      }else if (infixOn) {
+        infixOn = 0; status = executeToken(infixToken);
+        if (status & STATUS_BREAK) return(status);
+      }
+
     }
     
     break;
@@ -929,7 +968,17 @@ int executePrimitive(ob) 
       token = tokenArray[i];
       /***printf("[token %d]%s\n",i,token.token);*/
       status = executeToken(token);
-      if (status != 0) break;
+      if (status & STATUS_BREAK) break;
+
+      if (status & STATUS_INFIX) {
+        if (i == size-1) errorStackmachine("infix operator at the end(exec).\n");
+        infixOn = 1; infixToken = tokenArray[i];
+        infixToken.tflag |= NO_DELAY; continue;
+      }else if (infixOn) {
+        infixOn = 0; status = executeToken(infixToken);
+        if (status & STATUS_BREAK) break;
+      }
+
     }
     break;
 
@@ -1515,7 +1564,17 @@ int executePrimitive(ob) 
     for (i=0; i<size; i++) {
       token = tokenArray[i];
       status = executeToken(token);
-      if (status != 0) break;
+      if (status & STATUS_BREAK) break;
+
+      if (status & STATUS_INFIX) {
+        if (i == size-1) errorStackmachine("infix operator at the end(sendmsg).\n");
+        infixOn = 1; infixToken = token;
+        infixToken.tflag |= NO_DELAY; continue;
+      }else if (infixOn) {
+        infixOn = 0; status = executeToken(infixToken);
+        if (status & STATUS_BREAK) break;
+      }
+
     }
     if (ccflag) {
       contextControl(CCPOP); ccflag = 0; /* recover the Current context. */
@@ -1564,7 +1623,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 +1650,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 +1662,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;
@@ -1616,7 +1688,17 @@ int executePrimitive(ob) 
     for (i=0; i<size; i++) {
       token = tokenArray[i];
       status = executeToken(token);
-      if (status != 0) break;
+      if (status & STATUS_BREAK) break;
+
+      if (status & STATUS_INFIX) {
+        if (i == size-1) errorStackmachine("infix operator at the end(primmsg).\n");
+        infixOn = 1; infixToken = tokenArray[i];
+        infixToken.tflag |= NO_DELAY; continue;
+      }else if (infixOn) {
+        infixOn = 0; status = executeToken(infixToken);
+        if (status & STATUS_BREAK) break;
+      }
+
     }
 
     contextControl(CCPOP); /* recover the Current context. */
@@ -1668,7 +1750,17 @@ int executePrimitive(ob) 
     for (i=0; i<size; i++) {
       token = tokenArray[i];
       status = executeToken(token);
-      if (status != 0) break;
+      if (status & STATUS_BREAK) break;
+
+      if (status & STATUS_INFIX) {
+        if (i == size-1) errorStackmachine("infix operator at the end(supmsg).\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 (ccflag) {
       contextControl(CCPOP); ccflag = 0; /* recover the Current context. */
@@ -1746,6 +1838,17 @@ int executePrimitive(ob) 
 	  for (i=0; i<size; i++) {
 		token = tokenArray[i];
 		status = executeToken(token);
+		if (status & STATUS_BREAK) break;
+
+        if (status & STATUS_INFIX) {
+          if (i == size-1) errorStackmachine("infix operator at the end(tlimit).\n");
+          infixOn = 1; infixToken = tokenArray[i];
+          infixToken.tflag |= NO_DELAY; continue;
+        }else if (infixOn) {
+          infixOn = 0; status = executeToken(infixToken);
+          if (status & STATUS_BREAK) break;
+        }
+
 	  }
 	  cancelAlarm();
 	}else{
@@ -1754,6 +1857,17 @@ int executePrimitive(ob) 
 	  for (i=0; i<size; i++) {
 		token = tokenArray[i];
 		status = executeToken(token);
+        if (status & STATUS_BREAK) break;
+
+        if (status & STATUS_INFIX) {
+          if (i == size-1) errorStackmachine("infix operator at the end(tlimit).\n");
+          infixOn = 1; infixToken = tokenArray[i];
+          infixToken.tflag |= NO_DELAY; continue;
+        }else if (infixOn) {
+          infixOn = 0; status = executeToken(infixToken);
+          if (status & STATUS_BREAK) break;
+        }
+
 	  }
       times(&after);
       after_real = time(&after_real);