Fixed gettoken for EOF

error.c

@@ -303,5 +303,11 @@ error (int errnum, char *fun, int arg)
       fclose (GET_PORT (input_stream));
     }
   ESCFORG;
-  longjmp (buf, 1);
+  if (init_flag)
+  {
+    init_flag = 0;
+    longjmp (buf, 2);
+  }
+  else
+    longjmp (buf, 1);
 }

main.c

@@ -93,7 +93,6 @@ int syntax_flag = YES;		//syntaxerrors/2 YES=normal. NO=ignore syntax-errors
 int string_term_flag = 0;	//for string_term/2 0=normal, 1=readparse from string_term_buffer
 int ctrl_c_flag = 0;		//for ctrl_c  to stop prove
 int init_flag = 1;		//for halt
-int greeting_flag = 1;		//for greeting message
 
 //operator token
 char operator[OPERATOR_NUMBER][5] = {
@@ -225,7 +224,6 @@ main (int argc, char *argv[])
   if (!init_flag)
     goto repl;
 
-  init_flag = 0;
   home = getenv ("HOME");
   strcpy (str, home);
   strcat (str, "/nprolog/library/dcg.pl");
@@ -325,10 +323,10 @@ main (int argc, char *argv[])
 	}
     }
 
-  if (greeting_flag)
+  if (init_flag)
     {
       printf ("N-Prolog Ver %1.2f\n", VERSION);
-      greeting_flag = 0;
+      init_flag = 0;
     }
 
 repl:

makefile

@@ -21,8 +21,7 @@ NPL_OBJS = main.o \
 	error.o \
 	bignum.o \
 	compute.o \
-	edit.o \
-	sam.o
+	edit.o 
 
 
 

npl.h

@@ -372,6 +372,7 @@ extern int listing_flag;
 extern int prefix_flag;
 extern int syntax_flag;
 extern int string_term_flag;
+extern int init_flag;
 
 //------pointer----
 extern int hp; //heap pointer

parser.c

@@ -997,6 +997,9 @@ gettoken (void)
 	{
 	  if (c == EOL)
 	    error (SYNTAX_ERR, "unexpected EOL in quoted atom ", NIL);
+
+	  if (c == EOF)
+	    error (SYNTAX_ERR, "unexpected EOF in quoted atom ", NIL);
 
 	  if (c == '\\')
 	    {
@@ -1078,6 +1081,8 @@ gettoken (void)
 	      else
 		error (SYNTAX_ERR, "double $ in string token ", NIL);
 	    }
+	  else if(c == EOF)
+	  	error (SYNTAX_ERR, "not exist right $ in file ", NIL);
 	  else
 	    {
 	      stok.buf[pos++] = c;

tests/test4.pl

@@ -0,0 +1,2 @@
+
+ffAon(Nf)'