===================================================================
RCS file: /home/cvs/OpenXM/src/k097/d.c,v
retrieving revision 1.6
retrieving revision 1.19
diff -u -p -r1.6 -r1.19
--- OpenXM/src/k097/d.c	2000/12/10 02:21:45	1.6
+++ OpenXM/src/k097/d.c	2016/04/02 08:20:09	1.19
@@ -1,14 +1,26 @@
-/* $OpenXM: OpenXM/src/k097/d.c,v 1.5 2000/05/04 11:05:19 takayama Exp $ */
+/* $OpenXM: OpenXM/src/k097/d.c,v 1.18 2013/11/06 06:23:23 takayama Exp $ */
 /* simple.c,  1996, 1/1 --- 1/5 */
 #include <stdio.h>
 #include <ctype.h>
 #include <setjmp.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 #include "d.h"
 #include "simple.tab.h"
+#include "ox_pathfinder.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
 
-jmp_buf KCenvOfParser;
+JMP_BUF KCenvOfParser;
 
 int DebugMode = 1;
 extern int K00_verbose;
@@ -34,6 +46,9 @@ int Debug2 = 0;
 
 int Interactive = 1;
 
+static int isThereStdin();
+#define MARK_CHAR  3
+
 main2(int argc, char *argv[]) {
   FILE *f;
   FILE *outf;
@@ -166,7 +181,7 @@ objectp newObject_d() {
     fprintf(stderr,"Error: No more memory in newObject_d().\n");
     exit(10);
   }
-  obj->tag = Snull;
+  obj->tag = Snull;  obj->attr = NULL;
   return(obj);
 }
 
@@ -584,8 +599,14 @@ KCerror(char *s)   /* You need this function. Otherwis
 {
   K00recoverFromError();
   fprintf(stderr,"\nSyntax Error in the line %d:%s\n",Linenumber,s);
-  showStringBuff(Inop); return ;
-  longjmp(KCenvOfParser,2);
+  showStringBuff(Inop);
+  /* Clean the junks. Try load("debug/buggy.k"); */
+  if (isThereStdin()) {
+	ungetc(MARK_CHAR,stdin);
+	while (fsgetc(Inop) > MARK_CHAR) ;
+  }
+  return 0;
+  LONGJMP(KCenvOfParser,2);
   exit(1); 
 }
 
@@ -596,11 +617,11 @@ readcomment() {
     if (c == EOF) {
       fprintf(stderr,"%d: Unexpected end of file in a comment.\n",Linenumber);
       fsungetc(c,Inop); /* should change */
-      return;
+      return 0;
     }
     if (c == '*') {
       c = fsgetc(Inop);
-      if (c == '/') return;
+      if (c == '/') return 0;
     }
   }
 }
@@ -877,6 +898,15 @@ static int popFile() {
   return(Saki);
 }
 
+static int isThereStdin() {
+  if (Stackp > 1 && (InopStack[1])->tag == Sfile
+	  && (InopStack[1])->lc.file == stdin) {
+	return(1);
+  }else{
+	return(0);
+  }
+}
+
 int fsgetc(objectp op) {
   struct stringBuf *obuf;
   char *str;
@@ -1028,6 +1058,11 @@ void loadFileWithCpp(objectp op)
   char tmpName[1024];
   int pid;
   objectp ob;
+  char *outfile;
+  char *cpp;
+  char *argv[10];
+  int n;
+  char *sfile = NULL;
   if (op->tag != Sstring) {
     fprintf(stderr,"File name must be given as an argment of load.\n");
     return;
@@ -1038,21 +1073,50 @@ void loadFileWithCpp(objectp op)
     fprintf(stderr,"Too long file name.\n");
     return;
   }
-  system("/bin/rm -f k00.cppload.tmp");
-  /* Use gcc -v to know what symbols are defined. */
-#if defined(linux) || defined(__linux__)
-  strcpy(fname,"/lib/cpp -P -lang-c++ <");
+  /* Use gcc -v to know what symbols are defined. 
+	 if  defined(linux) || defined(__linux__) 
+	 Removed old codes. */
+
+  sfile = op->lc.str;
+  cpp = getCppPath();
+  if (cpp == NULL) {
+	fprintf(stderr,"cpp is not found.\n"); return;
+  }
+  /* printf("%s\n",cpp); */
+  outfile = generateTMPfileName("k0-cpp");
+  if (outfile == NULL) {
+	fprintf(stderr,"Failed to generate a temporary file name.\n"); return;
+  }
+  /* printf("%s\n",outfile); */
+  if ((char *)strstr(cpp,"/asir/bin/cpp.exe") == NULL) {
+#if defined(__clang__)
+    sprintf(tmpName,"cpp -E -P %s | sed -e 's/^#.*//g' >%s",sfile,outfile);
 #else
-  strcpy(fname,"cpp -P -lang-c++ <");
+	argv[0] = cpp;
+	argv[1] = "-P";
+	argv[2] = "-lang-c++";
+	argv[3] = sfile;
+	argv[4] = outfile;
+	argv[5] = NULL;
 #endif
-  strcat(fname,op->lc.str);
-  strcat(fname,"  >k00.cppload.tmp");
-  system(fname);
+  }else{
+	argv[0] = cpp;
+	argv[1] = "-P";
+	argv[2] = cygwinPathToWinPath(sfile);
+	argv[3] = cygwinPathToWinPath(outfile);
+	argv[4] = NULL;
+  }
+#if defined(__clang__)
+  system(tmpName);
+#else
+  n=oxForkExecBlocked(argv);
+#endif
+
   ob = newObject_d();
   ob->tag = Sstring;
-  ob->lc.str = "k00.cppload.tmp";
+  ob->lc.str = outfile;
   loadFile(ob);
-  system("/bin/rm -f k00.cppload.tmp");
+  unlink(outfile);
 }
 
 void showStringBuff(objectp op)
@@ -1084,20 +1148,8 @@ void showStringBuff(objectp op)
   fprintf(stderr,"\n");
 }
 
+
+
 char *getLOAD_K_PATH() {
-  char *p;
-  char *p2;
-  p = getenv("LOAD_K_PATH");
-  if (p == NULL) {
-    return("/usr/local/lib/kxx97/yacc/");
-  }else{
-    if (strlen(p) == 0) return(p);
-    if (p[strlen(p)-1] == '/') return(p);
-    /* Add / */
-    p2 = (char *) malloc(sizeof(char)*(strlen(p)+3));
-    if (p2 == NULL) { fprintf(stderr,"No more memory.\n"); exit(10); }
-    strcpy(p2,p); strcat(p2,"/");
-    return(p2);
-  }
+  return getLOAD_K_PATH2();
 }
-