progress

C/absmi.c

@@ -971,7 +971,7 @@ static void undef_goal(USES_REGS1) {
       *ip = d1;
       continue;
 
-      derefa_body(d1, pt0, undef_unk, undef_nonvar);
+      deref_body(d1, pt0, undef_unk, undef_nonvar);
       if (pt0 < HR) {
         /* variable is safe */
         *ip = (CELL)pt0;

CMakeLists.txt

@@ -324,6 +324,7 @@ set(YAP_LIBDIR  ${CMAKE_INSTALL_FULL_LIBDIR})
 set(YAP_DLLDIR  ${CMAKE_INSTALL_FULL_LIBDIR}/Yap)
 set(YAP_PLDIR  ${CMAKE_INSTALL_FULL_DATADIR}/Yap)
 
+set(YAP_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_INCLUDEDIR}/Yap)
 set(YAP_INSTALL_LIBDIR ${CMAKE_INSTALL_LIBDIR}/Yap)
 set(YAP_INSTALL_DATADIR ${CMAKE_INSTALL_DATADIR}/Yap)
 

H/YapGFlagInfo.h

@@ -68,12 +68,16 @@ opportunity. Initial value is 10,000. May be changed. A value of 0
     read-only boolean, a machine running an Google's Android version of the
     Linux Operating System */
   YAP_FLAG(ANDROID_FLAG, "android", false, booleanFlag, "true", NULL),
+  #else
+  YAP_FLAG(ANDROID_FLAG, "android", false, booleanFlag, "false", NULL),
 #endif
 
 #if __APPLE__
  /**<
     read-only boolean, a machine running an Apple Operating System */
   YAP_FLAG(APPLE_FLAG, "apple", false, booleanFlag, "true", NULL),
+  #else
+    YAP_FLAG(APPLE_FLAG, "apple", false, booleanFlag, "false", NULL),
 #endif
  /**<
       read-only atom, it describes the ISA used in this version of YAP.

os/readterm.c

@@ -401,14 +401,13 @@ static Term syntax_error(TokEntry *errtok, int sno, Term cmod, Int newpos, bool
 #endif
       if (GLOBAL_Stream[sno].status & Seekable_Stream_f)
         {
-          while (tok)
-            {
-              if (tok->Tok != Error_tok)
+          while (tok && tok->Tok != Error_tok && tok != errtok)
                 {
-                  tok = tok->TokNext;
+		  if (tok->TokNext)
+		    tok = tok->TokNext;
+		  else
+		    break;
                 }
-	      break;
-	    }
           err_line = tok->TokLine;
           errpos = tok->TokPos -1;
           if (errpos <= startpos)