===================================================================
RCS file: /home/cvs/OpenXM/src/kxx/oxserver00.c,v
retrieving revision 1.11
retrieving revision 1.15
diff -u -p -r1.11 -r1.15
--- OpenXM/src/kxx/oxserver00.c	2003/11/18 11:08:27	1.11
+++ OpenXM/src/kxx/oxserver00.c	2004/09/05 00:51:18	1.15
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM/src/kxx/oxserver00.c,v 1.10 2003/08/22 16:08:23 ohara Exp $ */
+/* $OpenXM: OpenXM/src/kxx/oxserver00.c,v 1.14 2004/03/08 08:24:42 takayama Exp $ */
 /* nullserver01 */
 #include <stdio.h>
 #include <sys/types.h>
@@ -15,10 +15,12 @@
 int OxCritical = 0;
 int OxInterruptFlag = 0;
 int PacketMonitor = 0;
+int NoExecution = 0;
 
 extern int SerialOX;  /* Serial number of the packets sent. */
 extern int SerialCurrent;  /* Current Serial number of the recieved packet. */
 extern int OXprintMessage; /* print oxmessages? */
+extern int Calling_ctrlC_hook;
 
 #if defined(__CYGWIN__)
 sigjmp_buf EnvOfChildServer;
@@ -27,6 +29,7 @@ jmp_buf EnvOfChildServer;
 #endif
 
 int JmpMessage = 0;
+extern int Lisplike;
 
 static char *getSuffix(char *s);
 main(int argc, char *argv[]) {
@@ -43,6 +46,12 @@ main(int argc, char *argv[]) {
     if (strcmp(argv[1],"-monitor")==0) {
       fprintf(stderr,"Taking the packet monitor.\n");
       PacketMonitor = 1;
+    }else if (strcmp(argv[1],"-lispLike")==0) {
+      fprintf(stderr,"Output lispLike expression.\n");
+      Lisplike = 1;
+    }else if (strcmp(argv[1],"-noexec")==0) {
+      fprintf(stderr,"I do not execute commands.\n");
+      NoExecution = 1;
     }else{
       fprintf(stderr,"Unknown option. Possible options are -monitor\n");
     }
@@ -96,8 +105,8 @@ nullserver(int fdStreamIn,int fdStreamOut) {
 #endif
   int engineByteOrder;
 
-  /* for debug */
-  PacketMonitor = 1;
+  /* for debug,  use -monitor
+	 PacketMonitor = 1;  */
 
   fflush(NULL);
   engineByteOrder = oxTellMyByteOrder(fdStreamOut,fdStreamIn);
@@ -131,7 +140,11 @@ nullserver(int fdStreamIn,int fdStreamOut) {
     if (OxInterruptFlag == 0) {
       fprintf(stderr," ?! \n"); fflush(NULL);
     }
-	KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+    if (!Calling_ctrlC_hook) {
+      Calling_ctrlC_hook = 1;
+      KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+    }
+    Calling_ctrlC_hook = 0;
 	KSexecuteString(" (Computation is interrupted.) ");
     signal(SIGUSR1,controlResetHandler); goto aaa;
   } else {  
@@ -157,7 +170,11 @@ nullserver(int fdStreamIn,int fdStreamOut) {
     */
     Sm1_pushError2(SerialCurrent,-1,"Global jump by sm1 error");
 
-	KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+    if (!Calling_ctrlC_hook) {
+      Calling_ctrlC_hook = 1;
+      KSexecuteString(" ctrlC-hook "); /* Execute User Defined functions. */
+    }
+    Calling_ctrlC_hook = 0;
     signal(SIGUSR1,controlResetHandler); goto aaa ;
   } else {
     if (JmpMessage) fprintf(stderr,"Set EnvOfStackMachine.\n"); 
@@ -237,51 +254,46 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea
   message = OXprintMessage;  
   /* message_body */
   id = oxGetInt32(ostreamIn);   /* get the function_id */
-  if (message) {fprintf(stderr,"\nfunction_id is %d\n",id);}
+  if (message) {fprintf(stderr,"\nfunction_id is %d; %s\n",id,oxFIDtoStr(id));}
   switch( id ) {
   case SM_mathcap:
-    if (message) fprintf(stderr," mathcap\n");
     mathresult = (struct mathCap *)Sm1_mathcap();
     oxPushMathCap(mathresult);
     break;
   case SM_setMathCap:
-    if (message) fprintf(stderr," setMathCap\n");
     Sm1_setMathCap(ostreamOut);
     break;
   case SM_pops:
-    if (message) fprintf(stderr," pops \n");
     Sm1_pops();
     break;
   case SM_getsp:
-    if (message) fprintf(stderr," getsp \n");
     Sm1_getsp();
     break;
   case SM_dupErrors:
-    if (message) fprintf(stderr," dupErrors \n");
     Sm1_dupErrors();
     break;
   case SM_pushCMOtag:
-    if (message) fprintf(stderr," pushCMOtag \n");
     Sm1_pushCMOtag(SerialCurrent);
     break;
   case SM_setName:
-    if (message) fprintf(stderr," setName \n");
     iresult = Sm1_setName();
     if (iresult < 0) {
       Sm1_pushError2(SerialCurrent,-1,"setName");
     }
     break;
   case SM_evalName:
-    if (message) fprintf(stderr," evalName \n");
     iresult = Sm1_evalName();
     if (iresult < 0) {
       Sm1_pushError2(SerialCurrent,-1,"evalName");
     }
     break;
   case SM_executeStringByLocalParser:
-    if (message) fprintf(stderr," executeStringByLocalParser\n");
     OxCritical = 0;
-    iresult = Sm1_executeStringByLocalParser();
+	if (NoExecution) {
+	  iresult = 0;
+	}else{
+	  iresult = Sm1_executeStringByLocalParser();
+	}
     OxCritical = 1; signal(SIGUSR1,controlResetHandler);
     if (iresult < 0) {
       emsg = Sm1_popErrorMessage("executeString: ");
@@ -290,9 +302,12 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea
     }
     break;
   case SM_executeFunction:
-    if (message) fprintf(stderr," executeFunction\n");
     OxCritical = 0;
-    iresult = Sm1_executeStringByLocalParser();
+	if (NoExecution) {
+	  iresult = 0;
+	}else{
+	  iresult = Sm1_executeStringByLocalParser();
+	}
     OxCritical = 1; signal(SIGUSR1,controlResetHandler);
     if (iresult < 0) {
       emsg = Sm1_popErrorMessage("executeFunction: ");
@@ -300,14 +315,26 @@ nullserverCommand(ox_stream ostreamIn,ox_stream ostrea
       return(-1);
     }
     break;
+  case SM_executeFunctionWithOptionalArgument:
+    OxCritical = 0;
+	if (NoExecution) {
+	  iresult = 0;
+	}else{
+	  iresult = Sm1_executeStringByLocalParser();
+	}
+    OxCritical = 1; signal(SIGUSR1,controlResetHandler);
+    if (iresult < 0) {
+      emsg = Sm1_popErrorMessage("executeFunctionWithOptionalArgument: ");
+      Sm1_pushError2(SerialCurrent,-1,emsg);
+      return(-1);
+    }
+    break;
   case SM_popCMO:
-    if (message) fprintf(stderr,"popCMO.  Start to sending data.\n",n);
     oxSendOXheader(ostreamOut,OX_DATA,SerialOX++);
     n=Sm1_popCMO(ostreamOut,SerialCurrent);
     if (message) fprintf(stderr,"Done.\n"); 
     break;
   case SM_popString:
-    if (message) fprintf(stderr,"popString. send data from the stack.\n",n);
     oxSendOXheader(ostreamOut,OX_DATA,SerialOX++);
     oxSendCmoString(ostreamOut,Sm1_popString());
     if (message) fprintf(stderr,"Done.\n");
@@ -349,6 +376,7 @@ void controlResetHandler(sig)
   if (OxCritical) {
     return;
   }else{
+    (void) traceShowStack(); traceClearStack();
 #if defined(__CYGWIN__)
     siglongjmp(EnvOfChildServer,2); /* returns 2 for ctrl-C */
 #else