===================================================================
RCS file: /home/cvs/OpenXM/src/k097/d.c,v
retrieving revision 1.2
retrieving revision 1.7
diff -u -p -r1.2 -r1.7
--- OpenXM/src/k097/d.c	2000/01/21 03:01:25	1.2
+++ OpenXM/src/k097/d.c	2001/01/08 05:26:48	1.7
@@ -1,4 +1,4 @@
-/* $OpenXM$ */
+/* $OpenXM: OpenXM/src/k097/d.c,v 1.6 2000/12/10 02:21:45 takayama Exp $ */
 /* simple.c,  1996, 1/1 --- 1/5 */
 #include <stdio.h>
 #include <ctype.h>
@@ -13,7 +13,7 @@ jmp_buf KCenvOfParser;
 int DebugMode = 1;
 extern int K00_verbose;
 
-static FILE *outfile = stdout;
+static FILE *outfile;
 int Linenumber = 0;
 objectp Inop = (objectp) NULL;  /* Input stream */
 int Saki = 0;   /* Look a head */
@@ -34,6 +34,9 @@ int Debug2 = 0;
 
 int Interactive = 1;
 
+static int isThereStdin();
+#define MARK_CHAR  3
+
 main2(int argc, char *argv[]) {
   FILE *f;
   FILE *outf;
@@ -584,7 +587,13 @@ KCerror(char *s)   /* You need this function. Otherwis
 {
   K00recoverFromError();
   fprintf(stderr,"\nSyntax Error in the line %d:%s\n",Linenumber,s);
-  showStringBuff(Inop); return ;
+  showStringBuff(Inop);
+  /* Clean the junks. Try load("debug/buggy.k"); */
+  if (isThereStdin()) {
+	ungetc(MARK_CHAR,stdin);
+	while (fsgetc(Inop) > MARK_CHAR) ;
+  }
+  return ;
   longjmp(KCenvOfParser,2);
   exit(1); 
 }
@@ -877,6 +886,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;
@@ -961,19 +979,22 @@ void parseAstring(char *s)
 
 }
 
-void loadFile(objectp op)
-{
+objectp checkIfTheFileExists(objectp op) {
   FILE *fp;
   char fname[1024];
+  char *s;
+  objectp nullObj;
+  nullObj = NULL;
   if (op->tag != Sstring) {
     fprintf(stderr,"File name must be given as an argment of load.\n");
-    return;
+    return nullObj;
   }
-  if (strlen(op->lc.str) > 1000) {
+  if (strlen(op->lc.str) > 800) {
     fprintf(stderr,"Too long file name.\n");
-    return;
+    return nullObj;
   }
-  fp = fopen(op->lc.str,"r");
+  strcpy(fname,op->lc.str);
+  fp = fopen(fname,"r");
   if (fp == (FILE *)NULL) {
     strcpy(fname,getLOAD_K_PATH());
     strcat(fname,op->lc.str);
@@ -983,11 +1004,36 @@ void loadFile(objectp op)
       strcat(fname,op->lc.str);
       fp = fopen(fname,"r");
       if (fp == (FILE *)NULL) {
-	fprintf(stderr,"Cannot open the file <<%s>> for loading in the current directory nor the library directories %s and %s.\n",op->lc.str,getLOAD_K_PATH(),LOAD_K_PATH);
-	return;
+		fprintf(stderr,"Cannot open the file <<%s>> for loading in the current directory nor the library directories %s and %s.\n",op->lc.str,getLOAD_K_PATH(),LOAD_K_PATH);
+		return nullObj;
       }
     }
   }
+  close(fp);
+  op = newObject_d();
+  op->tag = Sstring;
+  s = (char *)GC_malloc(sizeof(char)*(strlen(fname)+1));
+  if (s == NULL) fprintf(stderr,"No more memory.\n");
+  strcpy(s,fname);
+  op->lc.str = s;
+  return(op);
+}
+
+void loadFile(objectp op)
+{
+  FILE *fp;
+  char fname[1024];
+  if (op->tag != Sstring) {
+    fprintf(stderr,"File name must be given as an argment of load.\n");
+    return;
+  }
+  op = checkIfTheFileExists(op);
+  if (op == NULL) return;
+  if (strlen(op->lc.str) > 1000) {
+    fprintf(stderr,"Too long file name.\n");
+    return;
+  }
+  fp = fopen(op->lc.str,"r");
   if (K00_verbose) fprintf(stderr,"Reading the file <<%s>>...  ",op->lc.str);
   parseAfile(fp);
   if (K00_verbose) fprintf(stderr,"\nClosed the file <<%s>>.\n",op->lc.str);
@@ -997,17 +1043,26 @@ void loadFileWithCpp(objectp op)
 {
   FILE *fp;
   char fname[1024];
+  char tmpName[1024];
+  int pid;
   objectp ob;
   if (op->tag != Sstring) {
     fprintf(stderr,"File name must be given as an argment of load.\n");
     return;
   }
+  op = checkIfTheFileExists(op);
+  if (op == NULL) return;
   if (strlen(op->lc.str) > 900) {
     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++ <");
+#else
+  strcpy(fname,"cpp -P -lang-c++ <");
+#endif
   strcat(fname,op->lc.str);
   strcat(fname,"  >k00.cppload.tmp");
   system(fname);
@@ -1015,6 +1070,7 @@ void loadFileWithCpp(objectp op)
   ob->tag = Sstring;
   ob->lc.str = "k00.cppload.tmp";
   loadFile(ob);
+  system("/bin/rm -f k00.cppload.tmp");
 }
 
 void showStringBuff(objectp op)