===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/stackmachine.c,v
retrieving revision 1.22
retrieving revision 1.39
diff -u -p -r1.22 -r1.39
--- OpenXM/src/kan96xx/Kan/stackmachine.c	2004/09/12 01:32:08	1.22
+++ OpenXM/src/kan96xx/Kan/stackmachine.c	2015/10/08 11:49:37	1.39
@@ -1,7 +1,9 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/stackmachine.c,v 1.21 2004/09/12 00:26:21 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/stackmachine.c,v 1.38 2015/09/29 01:52:14 takayama Exp $ */
 /*   stackmachin.c */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "datatype.h"
 #include "stackm.h"
 #include "extern.h"
@@ -10,6 +12,15 @@
 #include <signal.h>
 #include <sys/types.h>
 
+/* The msys2 seems to make a buffer overflow of  EnvOfStackmachine[].
+The code
+[(x) ring_of_differential_operators 11] define_ring
+( Dx*(x+Dx) ) /ff set
+causes the segfault because Mp_zero is borken. Is it a bug of msys2?
+Anyway, the following definition seems to be a workaround. 2015.09
+Singnals do not work properly on msys2. (gcc -dM -E ... to see macros defs)
+See stackm.h
+*/
 
 /* #define OPERAND_STACK_SIZE  2000 */
 #define OPERAND_STACK_SIZE 30000 
@@ -52,7 +63,7 @@ struct context *CurrentContextp = &StandardContext;
 struct context *PrimitiveContextp = &StandardContext;
 
 
-static struct object ObjTmp; /* for poor compiler */
+static struct object ObjTmp = OINIT; /* for poor compiler */
 
 int Calling_ctrlC_hook = 0;
 
@@ -74,6 +85,7 @@ static strToInteger(char *);
 static power(int s,int i);
 static void pstack(void);
 static struct object executableStringToExecutableArray(char *str);
+static int isThereExecutableArrayOnStack(int n);
 
 extern int SerialCurrent;
 extern int QuoteMode;
@@ -86,6 +98,10 @@ int OXlockSaved = 0;
 char *UD_str;
 int  UD_attr;
 
+struct object *MsgStackTraceInArrayp = NULL;
+char *MsgStackTrace = NULL;
+char *MsgSourceTrace = NULL;
+
 struct object * newObject() 
 {
   struct object *r;
@@ -94,13 +110,14 @@ struct object * newObject() 
   r->tag = 0;
   (r->lc).ival = 0;
   (r->rc).ival = 0;
+  r->attr = NULL;
   return(r);
 }
 
 struct object newObjectArray(size) 
      int size;
 {
-  struct object rob;
+  struct object rob = OINIT;
   struct object *op;
   if (size < 0) return(NullObject);
   if (size > 0) {
@@ -295,6 +312,12 @@ int putUserDictionary2(str,h0,h1,attr,dic)
     }
     return(0);
   }
+  if (OR_ATTR_FOR_ALL_WORDS & attr) {
+    for (i=0; i<USER_DICTIONARY_SIZE; i++) {
+      if ((dic[i]).key !=EMPTY) (dic[i]).attr |= attr&(~OR_ATTR_FOR_ALL_WORDS);
+    }
+    return(0);
+  }
   x = h0;
   if (str[0] == '\0') {
     errorKan1("%s\n","putUserDictionary2(): You are defining a value with the null key.");
@@ -316,7 +339,7 @@ int putPrimitiveFunction(str,number)
      char *str;
      int number;
 {
-  struct object ob;
+  struct object ob = OINIT;
   ob.tag = Soperator;
   ob.lc.ival = number;
   return(putSystemDictionary(str,ob));
@@ -458,11 +481,37 @@ struct object peek(k)
   }
 }
 
+static int isThereExecutableArray(struct object ob) {
+  int n,i;
+  struct object otmp = OINIT;
+  if (ob.tag == SexecutableArray) return(1);
+  if (ob.tag == Sarray) {
+    n = getoaSize(ob);
+    for (i=0; i<n; i++) {
+      otmp = getoa(ob,i);
+      if (isThereExecutableArray(otmp)) return(1);
+    }
+    return(0);
+  }
+  /* Class and list is not checked, since there is no parser
+     to directory translte these objects. */
+  return(0);
+}
+static int isThereExecutableArrayOnStack(int n) {
+  int i;
+  struct object ob = OINIT;
+  for (i=0; i<n; i++) {
+    if (Osp-i-1 < 0) return(0);
+    ob = peek(i);
+    if (isThereExecutableArray(ob)) return(1); 
+  }
+  return(0);
+}
 
 struct object newOperandStack(int size)
 {
   struct operandStack *os ;
-  struct object ob;
+  struct object ob = OINIT;
   os = (struct operandStack *)sGC_malloc(sizeof(struct operandStack));
   if (os == (void *)NULL) errorStackmachine("No more memory.");
   if (size <= 0) errorStackmachine("Size of stack must be more than 1.");
@@ -543,7 +592,7 @@ void KsetContext(struct object contextObj)  {
 
 
 struct object getSuperContext(struct object contextObj) {
-  struct object rob;
+  struct object rob = OINIT;
   struct context *cp;
   if (contextObj.tag != Sclass) {
     errorStackmachine("Usage:supercontext");
@@ -609,7 +658,7 @@ int isLiteral(str)
 
 void printOperandStack() {
   int i;
-  struct object ob;
+  struct object ob = OINIT;
   int vs;
   vs = VerboseStack; VerboseStack = 2;
   for (i=Osp-1; i>=0; i--) {
@@ -645,7 +694,7 @@ struct object showSystemDictionary(int f) {
   int maxl;
   char format[1000];
   int nl;
-  struct object rob;
+  struct object rob = OINIT;
   rob = NullObject;
   if (f != 0) {
     rob = newObjectArray(Sdp);
@@ -718,7 +767,7 @@ static struct object executableStringToExecutableArray
      char *s;
 {
   struct tokens *tokenArray;
-  struct object ob;
+  struct object ob = OINIT;
   int i;
   int size;
   tokenArray = decomposeToTokens(s,&size);
@@ -737,7 +786,7 @@ static struct object executableStringToExecutableArray
 /****************  stack machine **************************/
 void scanner() {
   struct tokens token;
-  struct object ob;
+  struct object ob = OINIT;
   extern int Quiet;
   extern void ctrlC();
   int tmp, status;
@@ -747,13 +796,14 @@ void scanner() {
   extern int InSendmsg2;
   int infixOn = 0;
   struct tokens infixToken;
+  extern int RestrictedMode, RestrictedMode_saved;
   getokenSM(INIT);
   initSystemDictionary();
 
 #if defined(__CYGWIN__)
-  if (sigsetjmp(EnvOfStackMachine,1)) {
+  if (MYSIGSETJMP(EnvOfStackMachine,1)) {
 #else
-  if (setjmp(EnvOfStackMachine)) {
+  if (MYSETJMP(EnvOfStackMachine)) {
 #endif
     /* do nothing in the case of error */
     fprintf(stderr,"An error or interrupt in reading macros, files and command strings.\n");
@@ -815,9 +865,9 @@ void scanner() {
   
   for (;;) {
 #if defined(__CYGWIN__)
-    if (jval=sigsetjmp(EnvOfStackMachine,1)) {
+    if (jval=MYSIGSETJMP(EnvOfStackMachine,1)) {
 #else
-    if (jval=setjmp(EnvOfStackMachine)) {
+    if (jval=MYSETJMP(EnvOfStackMachine)) {
 #endif
       /* ***  The following does not work properly.  ****
          if (jval == 2) {
@@ -830,8 +880,9 @@ void scanner() {
         fprintf(Fstack,"\nscanner> ");
       }
       if (!Calling_ctrlC_hook) { /* to avoid recursive call of ctrlC-hook. */
-        Calling_ctrlC_hook = 1;
+        Calling_ctrlC_hook = 1; RestrictedMode = 0;
         KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+        RestrictedMode = RestrictedMode_saved;
       }
       Calling_ctrlC_hook = 0;  
       KSexecuteString(" (Computation is interrupted.) "); /* move to ctrlC-hook? */
@@ -862,9 +913,11 @@ void ctrlC(sig)
   extern int SGClock;
   extern int UserCtrlC;
   extern int OXlock;
+  extern int RestrictedMode, RestrictedMode_saved;
 
   signal(sig,SIG_IGN);
   /* see 133p */
+  RestrictedMode = RestrictedMode_saved;
   cancelAlarm();
   if (sig == SIGALRM) {
     fprintf(stderr,"ctrlC by SIGALRM\n");
@@ -910,25 +963,27 @@ void ctrlC(sig)
   getokenSM(INIT); /* It might fix the bug above. 1992/11/14 */
   signal(SIGINT,ctrlC);
 #if defined(__CYGWIN__)
-  siglongjmp(EnvOfStackMachine,2);
+  MYSIGLONGJMP(EnvOfStackMachine,2);
 #else
-  longjmp(EnvOfStackMachine,2); /* returns 2 for ctrl-C */
+  MYLONGJMP(EnvOfStackMachine,2); /* returns 2 for ctrl-C */
 #endif
 }
 
 int executeToken(token)
      struct tokens token;
 {      
-  struct object ob;
+  struct object ob = OINIT;
   int primitive;
   int size;
   int status;
-  struct tokens *tokenArray;
   int i,h0,h1;
   extern int WarningMessageMode;
   extern int Strict;
   extern int InSendmsg2;
+  extern int RestrictedMode, RestrictedMode_saved;
+  int localRestrictedMode_saved;
 
+  localRestrictedMode_saved = 0;
   if (GotoP) { /* for goto */
     if (token.kind == ID && isLiteral(token.token)) {
       if (strcmp(&((token.token)[1]),GotoLabel) == 0) {
@@ -976,22 +1031,30 @@ int executeToken(token)
       primitive = ((token.object.rc.op)->lc).ival;
       if (!(token.tflag & NO_DELAY)) {
         if ((ob.tag >= 0) && (UD_attr & ATTR_INFIX)) {
-          tracePopName(); return STATUS_INFIX; 
+          return STATUS_INFIX; 
         }
       }
       if (ob.tag >= 0) {
         /* there is a definition in the user dictionary */
         if (ob.tag == SexecutableArray) {
-          tracePushName(token.token);
-          tokenArray = ob.lc.tokenArray;
-          size = ob.rc.ival;
-          for (i=0; i<size; i++) {
-            status = executeToken(tokenArray[i]);
-            if (status != 0) {
-              tracePopName(); return(status);
-			}
+          if (RestrictedMode) {
+            if (UD_attr & ATTR_EXPORT) {
+              localRestrictedMode_saved = RestrictedMode; RestrictedMode = 0;
+              if (isThereExecutableArrayOnStack(5)) {
+				int i;
+                for (i=0; i<5; i++) { (void) Kpop(); }
+                errorStackmachine("Executable array is on the argument stack (restricted mode). They are automatically removed.\n");
+			  }
+            }else{
+              tracePushName(token.token);
+              errorStackmachine("You cannot execute this function in restricted mode.\n");
+            }
           }
-          tracePopName();
+
+          status = executeExecutableArray(ob,token.token,0);
+
+          if (localRestrictedMode_saved) RestrictedMode = localRestrictedMode_saved;
+          if ((status & STATUS_BREAK) || (status < 0)) return status;
         }else {
           Kpush(ob);
         }
@@ -1011,21 +1074,24 @@ int executeToken(token)
             return(0); /* normal exit.*/
           }
 		}
-        if (WarningMessageMode == 1 || WarningMessageMode == 2) {
+        {    
           char tmpc[1024];
           if (strlen(token.token) < 900) {
-            sprintf(tmpc,"\n%%Warning: The identifier <<%s>> is not in the system dictionary\n%%   nor in the user dictionaries. Push NullObject.\n",token.token);
-          }else {strcpy(tmpc,"Warning: identifier is not in the dictionaries.");}
-          pushErrorStack(KnewErrorPacket(SerialCurrent,-1,tmpc));
+            sprintf(tmpc,"\n>>Warning: The identifier <<%s>> is not in the system dictionary\n>>   nor in the user dictionaries. Push NullObject.\n",token.token);
+          }else {strcpy(tmpc,"\n>>Warning: identifier is not in the dictionaries.\n");}  
+          /* do not use %% in a string. tmpc will be used as  fprintf(stderr,tmpc); */
+          if (WarningMessageMode == 1 || WarningMessageMode == 2) {
+            pushErrorStack(KnewErrorPacket(SerialCurrent,-1,tmpc));
+          }
+          if (WarningMessageMode != 1) {
+            fprintf(Fstack,"%s",tmpc);
+            /*fprintf(Fstack,"(%d,%d)\n",h0,h1);*/
+          }
+          if (Strict) {
+            errorStackmachine(tmpc);
+          }
+          Kpush(NullObject); 
         }
-        if (WarningMessageMode != 1) {
-          fprintf(Fstack,"\n%%Warning: The identifier <<%s>> is not in the system dictionary\n%%   nor in the user dictionaries. Push NullObject.\n",token.token);
-          /*fprintf(Fstack,"(%d,%d)\n",h0,h1);*/
-        }
-        if (Strict) {
-          errorStackmachine("Warning: identifier is not in the dictionaries");
-        }
-        Kpush(NullObject); 
       }
     }
   } else if (token.kind == EXECUTABLE_STRING) {
@@ -1058,7 +1124,11 @@ errorStackmachine(str)
   char message0[1024];
   char *message;
   extern int ErrorMessageMode;
+  extern int RestrictedMode, RestrictedMode_saved;
+  RestrictedMode = RestrictedMode_saved;
   cancelAlarm();
+  MsgStackTrace = NULL;
+  MsgSourceTrace = NULL;
   if (ErrorMessageMode == 1 || ErrorMessageMode == 2) {
     pushErrorStack(KnewErrorPacket(SerialCurrent,-1,str));
   }
@@ -1092,7 +1162,9 @@ errorStackmachine(str)
       fprintf(stderr,str);
     }
     fprintf(stderr,"\n");
-    (void) traceShowStack(); 
+	MsgStackTraceInArrayp = traceNameStackToArrayp();
+    MsgStackTrace = traceShowStack(); 
+    MsgSourceTrace = traceShowScannerBuf();
   }
   traceClearStack();
   if (GotoP) {
@@ -1102,7 +1174,7 @@ errorStackmachine(str)
   stdOperandStack(); contextControl(CCRESTORE);
   getokenSM(INIT); /* It might fix the bug. 1996/3/10 */
   /* fprintf(stderr,"Now, Long jump!\n"); */
-  longjmp(EnvOfStackMachine,1);
+  MYLONGJMP(EnvOfStackMachine,1);
 }
 
 warningStackmachine(str)
@@ -1130,7 +1202,7 @@ KSexecuteString(s)
      char *s;
 {
   struct tokens token;
-  struct object ob;
+  struct object ob = OINIT;
   int tmp;
   extern int CatchCtrlC;
   int jval;
@@ -1140,6 +1212,7 @@ KSexecuteString(s)
   jmp_buf saved_EnvOfStackMachine;
   void (*sigfunc)();
   int localCatchCtrlC ;
+  extern int RestrictedMode, RestrictedMode_saved;
 
   localCatchCtrlC = CatchCtrlC;
   /* If CatchCtrlC is rewrited in this program,
@@ -1153,9 +1226,9 @@ KSexecuteString(s)
   if (KSPushEnvMode) {
     *saved_EnvOfStackMachine = *EnvOfStackMachine;
 #if defined(__CYGWIN__)
-    if (jval = sigsetjmp(EnvOfStackMachine,1)) {
+    if (jval = MYSIGSETJMP(EnvOfStackMachine,1)) {
 #else
-    if (jval = setjmp(EnvOfStackMachine)) {
+    if (jval = MYSETJMP(EnvOfStackMachine)) {
 #endif
       *EnvOfStackMachine = *saved_EnvOfStackMachine;
       if (jval == 2) {
@@ -1166,8 +1239,9 @@ KSexecuteString(s)
       recursive--;
       if (localCatchCtrlC) { signal(SIGINT, sigfunc); }
       if (!Calling_ctrlC_hook) {
-        Calling_ctrlC_hook = 1;
+        Calling_ctrlC_hook = 1; RestrictedMode = 0;
         KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+        RestrictedMode_saved;
       }
       Calling_ctrlC_hook = 0;
       KSexecuteString(" (Computation is interrupted.) "); /* move to ctrlC-hook?*/
@@ -1176,9 +1250,9 @@ KSexecuteString(s)
   }else{
     if (recursive == 0) {
 #if defined(__CYGWIN__)
-      if (jval=sigsetjmp(EnvOfStackMachine,1)) { 
+      if (jval=MYSIGSETJMP(EnvOfStackMachine,1)) { 
 #else
-      if (jval=setjmp(EnvOfStackMachine)) { 
+      if (jval=MYSETJMP(EnvOfStackMachine)) { 
 #endif
         if (jval == 2) {
           if (ErrorMessageMode == 1 || ErrorMessageMode == 2) {
@@ -1188,8 +1262,9 @@ KSexecuteString(s)
         recursive = 0;
         if (localCatchCtrlC) { signal(SIGINT, sigfunc); }
         if (!Calling_ctrlC_hook) {
-          Calling_ctrlC_hook = 1;
+          Calling_ctrlC_hook = 1; RestrictedMode = 0;
           KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+          RestrictedMode = RestrictedMode_saved;
         }
         Calling_ctrlC_hook = 0;
         Calling_ctrlC_hook = 0;
@@ -1219,7 +1294,7 @@ KSexecuteString(s)
 KSdefineMacros() {
   struct tokens token;
   int tmp;
-  struct object ob;
+  struct object ob = OINIT;
 
   if (StandardMacros && (strlen(SMacros))) {
     token.kind = EXECUTABLE_STRING; token.tflag = 0;
@@ -1240,7 +1315,7 @@ KSdefineMacros() {
 void KSstart() {
   struct tokens token;
   int tmp;
-  struct object ob;
+  struct object ob = OINIT;
   extern int Quiet;
 
   stackmachine_init(); KinitKan();
@@ -1249,7 +1324,7 @@ void KSstart() {
   /* The following line may cause a core dump, if you do not setjmp properly
      after calling KSstart().*/
   /*
-    if (setjmp(EnvOfStackMachine)) {
+    if (MYSETJMP(EnvOfStackMachine)) {
     fprintf(stderr,"KSstart(): An error or interrupt in reading macros, files and command strings.\n");
     exit(10);
     } else {  }  */
@@ -1294,7 +1369,7 @@ struct object KSpeek(k) {
 
 char *KSstringPop() {
   /* pop a string */
-  struct object rob;
+  struct object rob = OINIT;
   rob = Kpop();
   if (rob.tag == Sdollar) {
     return(rob.lc.str);
@@ -1334,6 +1409,10 @@ char *KSpopBinary(int *size) {
   return((char *)NULL);
 }
 
+struct object KSnewObjectArray(int k) {
+   return newObjectArray(k);
+}
+
 int pushErrorStack(struct object obj)
 {
   if (CurrentOperandStack == &ErrorStack) {
@@ -1364,8 +1443,8 @@ struct object popErrorStack(void) {
 }
 
 char *popErrorStackByString(void) {
-  struct object obj;
-  struct object eobj;
+  struct object obj = OINIT;
+  struct object eobj = OINIT;
   eobj = popErrorStack();
   if (ectag(eobj) != CLASSNAME_ERROR_PACKET) {
     return(NULL);
@@ -1394,7 +1473,7 @@ int KScheckErrorStack(void)
 
 struct object KnewErrorPacket(int serial,int no,char *message)
 {
-  struct object obj;
+  struct object obj = OINIT;
   struct object *myop;
   char *s;
   /* Set extended tag. */
@@ -1416,7 +1495,7 @@ struct object KnewErrorPacket(int serial,int no,char *
 
 struct object KnewErrorPacketObj(struct object ob1)
 {
-  struct object obj;
+  struct object obj = OINIT;
   struct object *myop;
   char *s;
   /* Set extended tag. */
@@ -1515,8 +1594,8 @@ int KSstackPointer() {
 }
 
 struct object KSdupErrors() {
-  struct object rob;
-  struct object ob;
+  struct object rob = OINIT;
+  struct object ob = OINIT;
   int i;
   int n;
   int m;
@@ -1573,6 +1652,17 @@ char *tracePopName(void) {
   if (TraceNameStackp <= 0) return (char *) NULL;
   return TraceNameStack[--TraceNameStackp];
 }
+struct object *traceNameStackToArrayp(void) {
+  int n,i;
+  struct object *op;
+  op = sGC_malloc(sizeof(struct object));
+  n = TraceNameStackp; if (n < 0) n = 0;
+  *op = newObjectArray(n);
+  for (i=0; i<n; i++) {
+	putoa((*op),i, KpoString(TraceNameStack[i]));
+  }
+  return op;
+}
 #define TRACE_MSG_SIZE 320
 char *traceShowStack(void) {
   char *s;
@@ -1589,8 +1679,8 @@ char *traceShowStack(void) {
     if (t == NULL) {
       s[p] = ';'; s[p+1] = 0;
       break;
-    }else if ((strlen(t) + p -10) > TRACE_MSG_SIZE) {
-	  /*	  fprintf(stderr,"p=%d, TraceNameStackp=%d, strlen(t)=%d, t=%s\n",p,TraceNameStackp,strlen(t),t); */
+    }else if ((strlen(t) + p) > (TRACE_MSG_SIZE-10)) {
+	  /* fprintf(stderr,"p=%d, TraceNameStackp=%d, strlen(t)=%d, t=%s\n",p,TraceNameStackp,strlen(t),t); */
       strcpy(&(s[p])," ...");
       break;
     }
@@ -1599,4 +1689,46 @@ char *traceShowStack(void) {
   } while (t != (char *)NULL);
   fprintf(stderr,"%s\n",s);
   return s;
+}
+
+/*
+  if (fname != NULL) fname is pushed to the trace stack.
+ */ 
+int executeExecutableArray(struct object ob,char *fname,int withGotoP) {
+  struct tokens *tokenArray;
+  int size,i;
+  int status;
+  int infixOn;
+  struct tokens infixToken;
+  extern int GotoP;
+  
+  infixOn = 0;
+  if (ob.tag != SexecutableArray) errorStackmachine("Error (executeTokenArray): the argument is not a token array.");
+
+  if (fname != NULL) tracePushName(fname);
+  tokenArray = ob.lc.tokenArray;
+  size = ob.rc.ival;
+  for (i=0; i<size; i++) {
+    status = executeToken(tokenArray[i]);
+    if ((status & STATUS_BREAK) || (status < 0) || (withGotoP && GotoP)) {
+      if (fname != NULL) tracePopName();
+      return(status);
+    }
+    
+    if (status & STATUS_INFIX) {
+      if (i == size-1) errorStackmachine("Infix operator at the end of an executable array.");
+      infixOn = 1; infixToken = tokenArray[i]; 
+      infixToken.tflag |= NO_DELAY;
+      continue;
+    }else if (infixOn) {
+      infixOn = 0;
+      status = executeToken(infixToken);
+      if ((status & STATUS_BREAK) || (status < 0) || (withGotoP && GotoP)) {
+        if (fname != NULL) tracePopName();
+        return(status);
+      }
+    }
+  }
+  if (fname != NULL) tracePopName();
+  return(0); /* normal exit */
 }