===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/sm1stackmachine.c,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -p -r1.5 -r1.8
--- OpenXM/src/kxx/sm1stackmachine.c	2005/07/18 10:55:16	1.5
+++ OpenXM/src/kxx/sm1stackmachine.c	2015/10/10 11:29:46	1.8
@@ -1,10 +1,12 @@
 #include <stdio.h>
 #include <setjmp.h>
+#include <stdlib.h>
 #include "ox_kan.h"
 #include "serversm.h"
 extern int OXprintMessage;
 extern char *MsgStackTrace;
 extern char *MsgSourceTrace;
+extern struct object *MsgStackTraceInArrayp;
 
 /*  server stack machine */
 
@@ -140,7 +142,13 @@ int Sm1_popCMO(ox_stream fp,int serial)
 int Sm1_pushError2(int serial, int no, char *s)
 {
   struct object ob = OINIT;
+  struct object core = OINIT; 
+  struct object core1 = OINIT; 
   char *ss;
+
+  ss = (char *)sGC_malloc(strlen(s)+1);
+  strcpy(ss,s);
+  /*
   char *error_message="<ox103:error_message>";
   char *message="<ox103:message>";
   char *stack_trace="<ox103:stack_trace>";
@@ -171,7 +179,27 @@ int Sm1_pushError2(int serial, int no, char *s)
 	strcat(ss,source_trace2);
   }
   strcat(ss,error_message2);
-  ob = KnewErrorPacket(serial,no,ss);
+  */
+
+  if (MsgStackTraceInArrayp != NULL) {
+	core = KSnewObjectArray(2);
+	core1 = KSnewObjectArray(2);
+	putoa(core1,0,KpoString("where"));  /* keyword */
+	putoa(core1,1,(*MsgStackTraceInArrayp));
+    putoa(core,0,core1);
+    core1 = KSnewObjectArray(2);
+	putoa(core1,0,KpoString("reason_of_error")); /* keyword */
+	putoa(core1,1,KpoString(s));
+	putoa(core,1,core1);
+  }else{
+	core = KSnewObjectArray(0);
+  }
+  ob = KSnewObjectArray(4);
+  putoa(ob,0,KpoInteger(serial)); putoa(ob,1,KpoInteger(no));
+  putoa(ob,2,KpoString(ss));
+  putoa(ob,3,core);
+
+  ob = KnewErrorPacketObj(ob);
   KSpush(ob);
 }