===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/Kan/stackmachine.c,v
retrieving revision 1.28
retrieving revision 1.34
diff -u -p -r1.28 -r1.34
--- OpenXM/src/kan96xx/Kan/stackmachine.c	2004/09/17 02:42:57	1.28
+++ OpenXM/src/kan96xx/Kan/stackmachine.c	2006/02/01 00:30:05	1.34
@@ -1,7 +1,9 @@
-/* $OpenXM: OpenXM/src/kan96xx/Kan/stackmachine.c,v 1.27 2004/09/16 23:53:44 takayama Exp $ */
+/* $OpenXM: OpenXM/src/kan96xx/Kan/stackmachine.c,v 1.33 2005/07/18 10:55:16 takayama Exp $ */
 /*   stackmachin.c */
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "datatype.h"
 #include "stackm.h"
 #include "extern.h"
@@ -52,7 +54,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 +76,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 +89,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 +101,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) {
@@ -322,7 +330,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));
@@ -464,11 +472,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.");
@@ -549,7 +583,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");
@@ -615,7 +649,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--) {
@@ -651,7 +685,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);
@@ -724,7 +758,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);
@@ -743,7 +777,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;
@@ -929,7 +963,7 @@ void ctrlC(sig)
 int executeToken(token)
      struct tokens token;
 {      
-  struct object ob;
+  struct object ob = OINIT;
   int primitive;
   int size;
   int status;
@@ -997,6 +1031,11 @@ int executeToken(token)
           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");
@@ -1076,6 +1115,8 @@ errorStackmachine(str)
   extern int RestrictedMode, RestrictedMode_saved;
   RestrictedMode = RestrictedMode_saved;
   cancelAlarm();
+  MsgStackTrace = NULL;
+  MsgSourceTrace = NULL;
   if (ErrorMessageMode == 1 || ErrorMessageMode == 2) {
     pushErrorStack(KnewErrorPacket(SerialCurrent,-1,str));
   }
@@ -1109,7 +1150,9 @@ errorStackmachine(str)
       fprintf(stderr,str);
     }
     fprintf(stderr,"\n");
-    (void) traceShowStack(); 
+	MsgStackTraceInArrayp = traceNameStackToArrayp();
+    MsgStackTrace = traceShowStack(); 
+    MsgSourceTrace = traceShowScannerBuf();
   }
   traceClearStack();
   if (GotoP) {
@@ -1147,7 +1190,7 @@ KSexecuteString(s)
      char *s;
 {
   struct tokens token;
-  struct object ob;
+  struct object ob = OINIT;
   int tmp;
   extern int CatchCtrlC;
   int jval;
@@ -1239,7 +1282,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;
@@ -1260,7 +1303,7 @@ KSdefineMacros() {
 void KSstart() {
   struct tokens token;
   int tmp;
-  struct object ob;
+  struct object ob = OINIT;
   extern int Quiet;
 
   stackmachine_init(); KinitKan();
@@ -1314,7 +1357,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);
@@ -1354,6 +1397,10 @@ char *KSpopBinary(int *size) {
   return((char *)NULL);
 }
 
+struct object KSnewObjectArray(int k) {
+   return newObjectArray(k);
+}
+
 int pushErrorStack(struct object obj)
 {
   if (CurrentOperandStack == &ErrorStack) {
@@ -1384,8 +1431,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);
@@ -1414,7 +1461,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. */
@@ -1436,7 +1483,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. */
@@ -1535,8 +1582,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;
@@ -1592,6 +1639,17 @@ void traceClearStack(void) {
 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) {