===================================================================
RCS file: /home/cvs/OpenXM/src/k097/ki.c,v
retrieving revision 1.2
retrieving revision 1.9
diff -u -p -r1.2 -r1.9
--- OpenXM/src/k097/ki.c	2000/01/21 03:01:25	1.2
+++ OpenXM/src/k097/ki.c	2015/10/10 11:29:46	1.9
@@ -1,4 +1,4 @@
-/* $OpenXM$ */
+/* $OpenXM: OpenXM/src/k097/ki.c,v 1.8 2013/11/06 06:23:23 takayama Exp $ */
 /* ki.c    ( kx interpreter )  */
 
 #include <stdio.h>
@@ -11,14 +11,26 @@
 #include "gradedset.h"
 #include <setjmp.h>
 #include <signal.h>
+#include <string.h>
+#include <stdlib.h>
 
 char *getLOAD_K_PATH();  /* from d.h */
 
+#if defined(__CYGWIN__)
+#define JMP_BUF sigjmp_buf
+#define SETJMP(env)  sigsetjmp(env,1)
+#define LONGJMP(env,p)  siglongjmp(env,p)
+#else
+#define JMP_BUF jmp_buf
+#define SETJMP(env)  setjmp(env)
+#define LONGJMP(env,p)  longjmp(env,p)
+#endif
+
 #ifdef CALLASIR
 #include "ak0.h"
 #endif
 
-extern jmp_buf KCenvOfParser;
+extern JMP_BUF KCenvOfParser;
 
 char Ktmp[10240];
 int Ksize = 10240;
@@ -32,10 +44,11 @@ extern int DebugMode;
 sendKan(int p) {
   static int n = 2;
   extern int Interactive;
-  struct object obj;
+  struct object obj = OINIT;
   int result;
+  extern int InSendmsg2;
   signal(SIGINT,SIG_IGN); /* Don't jump to ctrlC(). */
-  if (p == 10) {printf("In(%d)=",n++); return;}
+  if (p == 10) {printf("In(%d)= ",n++); return 0;}
   if (p == 0 && DebugCompiler) printf("sendKan[%s]\n",Kbuff); 
   /* printf("sendKan[%s]\n",Kbuff);   */
   if (strlen(Kbuff) != 0) {
@@ -46,7 +59,7 @@ sendKan(int p) {
   }
   /* fprintf(stderr,"r=%d ",result); */
   if (result == -1) {
-    K00recoverFromError();
+    K00recoverFromError();  InSendmsg2 = 0;
     fprintf(stderr,"--- Engine error or interrupt : ");
     if (DebugMode) {
       signal(SIGINT,SIG_DFL);
@@ -67,7 +80,8 @@ sendKan(int p) {
   }
 #define AFO
 #ifdef AFO
-  if (setjmp(KCenvOfParser)) {
+  if (SETJMP(KCenvOfParser)) {
+	InSendmsg2=0;
     fprintf(stderr,"Error: Goto the top level.\n");
     parseAfile(stdin);
     KCparse();  
@@ -76,7 +90,7 @@ sendKan(int p) {
     /* However, it should be rewrited in a future. */
   }else{ /* fprintf(stderr,"setjmp\n"); */ }
 #endif
-  if (p == 0 && Interactive) printf("In(%d)=",n++);
+  if (p == 0 && Interactive) printf("In(%d)= ",n++);
   Kpt=0; Kbuff[0] = '\0';
 }
 
@@ -88,7 +102,7 @@ char *s;
   if (strlen(s)+Kpt >= Ksize) {
     Ksize = Ksize*2;
     t = (char *)GC_malloc(sizeof(char)*Ksize);
-    if (t == (char *)NULL) { fprintf(stderr,"No memory."); exit();}
+    if (t == (char *)NULL) { fprintf(stderr,"No memory."); exit(1);}
     strcpy(t,Kbuff); Kbuff = t;
   }
   strcpy(&(Kbuff[Kpt]),s);
@@ -145,7 +159,7 @@ execFile(char *s)
 	    fprintf(stderr,"Fatal error: Cannot open the system macro %s in %s, %s, %s nor %s.\n",
 		    s,tname2,tname3,tname4,tname);
 	    exit(11);
-	    return;
+	    return 0;
 	  }
 	}
       }