===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/stackmachine.c,v
retrieving revision 1.10
retrieving revision 1.13
diff -u -p -r1.10 -r1.13
--- OpenXM/src/kan96xx/Kan/stackmachine.c	2002/11/04 10:53:56	1.10
+++ OpenXM/src/kan96xx/Kan/stackmachine.c	2003/11/20 09:20:36	1.13
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/stackmachine.c,v 1.9 2002/02/24 10:27:18 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/stackmachine.c,v 1.12 2002/11/07 23:35:23 takayama Exp $ */
 /*   stackmachin.c */
 
 #include <stdio.h>
@@ -74,6 +74,7 @@ static void pstack(void);
 static struct object executableStringToExecutableArray(char *str);
 
 extern int SerialCurrent;
+extern int QuoteMode;
 
 int SGClock = 0;
 int UserCtrlC = 0;
@@ -816,7 +817,7 @@ void scanner() {
         fprintf(Fstack,"\nscanner> ");
       }
       KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
-      KSexecuteString(" (Computation is interrupted.) ");
+      KSexecuteString(" (Computation is interrupted.) "); /* move to ctrlC-hook? */
       continue ;
     } else {  }
     if (DebugStack >= 1) { printOperandStack(); }
@@ -962,6 +963,9 @@ int executeToken(token)
         ob.lc.ival = primitive;
         return(executePrimitive(ob));
       } else {
+		if (QuoteMode) {
+		  return(DO_QUOTE);
+		}
         if (WarningMessageMode == 1 || WarningMessageMode == 2) {
           char tmpc[1024];
           if (strlen(token.token) < 900) {
@@ -1114,6 +1118,8 @@ KSexecuteString(s)
       }
       recursive--;
       if (localCatchCtrlC) { signal(SIGINT, sigfunc); }
+      KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+      KSexecuteString(" (Computation is interrupted.) "); /* move to ctrlC-hook?*/
       return(-1);
     }else{ }
   }else{
@@ -1130,6 +1136,8 @@ KSexecuteString(s)
         }
         recursive = 0;
         if (localCatchCtrlC) { signal(SIGINT, sigfunc); }
+		KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+		KSexecuteString(" (Computation is interrupted.) ");
         return(-1);
       }else { }
     }