python .h collision

2017-02-20 14:21:46 +00:00 · 2017-02-20 14:21:46 +00:00 · a53615ceaf
commit a53615ceaf
parent 92e2d94186
34 changed files with 48 additions and 51 deletions
--- a/C/arith0.c
+++ b/C/arith0.c
@ -111,7 +111,7 @@ static char     SccsId[] = "%W% %G%";
 #include "Yap.h"
 #include "Yatom.h"
 #include "YapHeap.h"
-#include "eval.h"
+#include "YapEval.h"



--- a/C/arith1.c
+++ b/C/arith1.c
@ -228,7 +228,7 @@ X is Y*10+C-48.
 #include "Yap.h"
 #include "Yatom.h"
 #include "YapHeap.h"
-#include "eval.h"
+#include "YapEval.h"

 static Term
 float_to_int(Float v USES_REGS)
--- a/C/arith2.c
+++ b/C/arith2.c
@ -127,7 +127,7 @@ These are the binary numeric operators currently supported by YAP.
 #include "Yap.h"
 #include "Yatom.h"
 #include "YapHeap.h"
-#include "eval.h"
+#include "YapEval.h"

 #include "arith2.h"

--- a/C/arrays.c
+++ b/C/arrays.c
@ -102,7 +102,7 @@ The following predicates manipulate arrays:
 #include "Yap.h"
 #include "Yatom.h"
 #include "clause.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "heapgc.h"
 #if HAVE_ERRNO_H
 #include <errno.h>
--- a/C/bignum.c
+++ b/C/bignum.c
@ -30,7 +30,7 @@ static char     SccsId[] = "%W% %G%";

 #ifdef USE_GMP

-#include "eval.h"
+#include "YapEval.h"
 #include "alloc.h"

 Term
--- a/C/cmppreds.c
+++ b/C/cmppreds.c
@ -57,7 +57,7 @@ static char SccsId[] = "%W% %G%";
 #include "Yap.h"
 #include "YapHeap.h"
 #include "Yatom.h"
-#include "eval.h"
+#include "YapEval.h"
 #if HAVE_STRING_H
 #include <string.h>
 #endif
--- a/C/compiler.c
+++ b/C/compiler.c
@ -174,7 +174,7 @@ static char SccsId[] = "%W% %G%";
 #include "Yap.h"
 #include "alloc.h"
 #include "clause.h"
-#include "compile.h"
+#include "YapCompile.h"
 #include "yapio.h"
 #if HAVE_STRING_H
 #include <string.h>
--- a/C/computils.c
+++ b/C/computils.c
@ -60,7 +60,7 @@ static char SccsId[] = "%W% %G%";
 #include "Yap.h"
 #include "Yatom.h"
 #include "YapHeap.h"
-#include "compile.h"
+#include "YapCompile.h"
 #include "yapio.h"
 #if HAVE_STRING_H
 #include <string.h>
@ -795,4 +795,3 @@ Yap_ShowCode (struct intermediates *cint)
 }

 #endif /* DEBUG */
-
--- a/C/depth_bound.c
+++ b/C/depth_bound.c
@ -22,7 +22,7 @@ static char     SccsId[] = "%W% %G%";

 #include "Yap.h"
 #include "Yatom.h"
-#include "eval.h"
+#include "YapEval.h"

 #ifdef DEPTH_LIMIT

--- a/C/eval.c
+++ b/C/eval.c
@ -31,7 +31,7 @@ static char SccsId[] = "%W% %G%";

 #include "YapHeap.h"
 #include "Yatom.h"
-#include "eval.h"
+#include "YapEval.h"
 #if HAVE_STDARG_H
 #include <stdarg.h>
 #endif
--- a/C/exo.c
+++ b/C/exo.c
@ -21,7 +21,7 @@
 #include "Yap.h"
 #include "clause.h"
 #include "yapio.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "tracer.h"
 #ifdef YAPOR
 #include "or.macros.h"
--- a/C/exo_udi.c
+++ b/C/exo_udi.c
@ -20,7 +20,7 @@
 #include "Yap.h"
 #include "clause.h"
 #include "yapio.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "tracer.h"
 #include "attvar.h"
 #ifdef YAPOR
--- a/C/flags.c
+++ b/C/flags.c
@ -60,7 +60,7 @@ static Int current_prolog_flag(USES_REGS1);
 static Int set_prolog_flag(USES_REGS1);

 #include "Yatom.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "yapio.h"

 #define YAP_FLAG(ID, NAME, WRITABLE, DEF, INIT, HELPER)                        \
--- a/C/gmp_support.c
+++ b/C/gmp_support.c
@ -18,7 +18,7 @@
 #include "Yap.h"
 #include "Yatom.h"
 #include "YapHeap.h"
-#include "eval.h"
+#include "YapEval.h"
 #if HAVE_STRING_H
 #include <string.h>
 #endif
--- a/C/grow.c
+++ b/C/grow.c
@ -20,7 +20,7 @@
 #include "yapio.h"
 #include "alloc.h"
 #include "sshift.h"
-#include "compile.h"
+#include "YapCompile.h"
 #include "attvar.h"
 #include "cut_c.h"
 #if HAVE_STRING_H
--- a/C/index.c
+++ b/C/index.c
@ -634,7 +634,7 @@ type_of_verb(rest,passive).
 */

 #include "absmi.h"
-#include "compile.h"
+#include "YapCompile.h"
 #if DEBUG
 #include "yapio.h"
 #endif
--- a/C/mavar.c
+++ b/C/mavar.c
@ -48,7 +48,7 @@ deterministic computations.

 #include "Yatom.h"
 #include "YapHeap.h"
-#include "eval.h"
+#include "YapEval.h"

 static Int p_setarg( USES_REGS1 );
 static Int p_create_mutable( USES_REGS1 );
--- a/C/parser.c
+++ b/C/parser.c
@ -141,7 +141,7 @@ dot with single quotes.
 #include "YapHeap.h"
 #include "YapText.h"
 #include "Yatom.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "yapio.h"
 /* stuff we want to use in standard YAP code */
 #include "iopreds.h"
--- a/C/range.c
+++ b/C/range.c
@ -21,7 +21,7 @@ static char     SccsId[] = "%W% %G%";
 #include "Yap.h"
 #include "Yatom.h"
 #include "YapHeap.h"
-#include "eval.h"
+#include "YapEval.h"

 static Int
 p_in_range( USES_REGS1 ) {
--- a/C/scanner.c
+++ b/C/scanner.c
@ -407,7 +407,7 @@ writing, writing a BOM can be requested using the option
 #include "YapHeap.h"
 #include "Yatom.h"
 #include "alloc.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "yapio.h"
 /* stuff we want to use in standard YAP code */
 #include "YapText.h"
--- a/C/signals.c
+++ b/C/signals.c
@ -30,7 +30,7 @@ static char SccsId[] = "%W% %G%";
 #endif
 #include "YapHeap.h"
 #include "Yatom.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "yapio.h"
 #ifdef TABLING
 #include "tab.macros.h"
--- a/C/stack.c
+++ b/C/stack.c
@ -30,7 +30,7 @@

 #include "Yap.h"
 #include "clause.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "iopreds.h"
 #include "tracer.h"
 #include "yapio.h"
--- a/C/stackinfo.c
+++ b/C/stackinfo.c
@ -31,7 +31,7 @@
 #include "Yap.h"
 #include "clause.h"
 #include "yapio.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "tracer.h"
 #ifdef YAPOR
 #include "or.macros.h"
--- a/C/stdpreds.c
+++ b/C/stdpreds.c
@ -37,7 +37,7 @@ static char SccsId[] = "%W% %G%";
 #include "Foreign.h"
 #include "YapHeap.h"
 #include "Yatom.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "yapio.h"
 #ifdef TABLING
 #include "tab.macros.h"
--- a/C/text.c
+++ b/C/text.c
@ -16,10 +16,10 @@
 *************************************************************************/

 #include "Yap.h"
+#include "YapEval.h"
 #include "YapHeap.h"
 #include "YapText.h"
 #include "Yatom.h"
-#include "eval.h"
 #include "yapio.h"

 #include <YapText.h>
--- a/C/threads.c
+++ b/C/threads.c
@ -26,7 +26,7 @@ static char     SccsId[] = "%W% %G%";
 #include "Yap.h"
 #include "Yatom.h"
 #include "YapHeap.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "yapio.h"
 #include "blobs.h"
 #include <stdio.h>
--- a/os/alias.c
+++ b/os/alias.c
@ -61,7 +61,7 @@ static char SccsId[] = "%W% %G%";
 #include "Yatom.h"
 #include "YapHeap.h"
 #include "yapio.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "YapText.h"
 #include <stdlib.h>
 #if HAVE_STDARG_H
--- a/os/chartypes.c
+++ b/os/chartypes.c
@ -74,7 +74,7 @@ static char SccsId[] = "%W% %G%";
 #define S_ISDIR(x) (((x)&_S_IFDIR) == _S_IFDIR)
 #endif
 #endif
-#include "eval.h"
+#include "YapEval.h"
 #include "iopreds.h"

 static Int p_change_type_of_char(USES_REGS1);
--- a/os/format.c
+++ b/os/format.c
@ -263,7 +263,7 @@ output is directed to the stream used by format/2.
 #endif
 #endif

-#include "eval.h"
+#include "YapEval.h"
 #include "iopreds.h"
 #include "format.h"

--- a/os/iopreds.c
+++ b/os/iopreds.c
@ -36,7 +36,7 @@ static char SccsId[] = "%W% %G%";
 #include "YapHeap.h"
 #include "YapText.h"
 #include "Yatom.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "yapio.h"
 #include <stdlib.h>
 #if HAVE_UNISTD_H
--- a/os/streams.c
+++ b/os/streams.c
@ -32,7 +32,7 @@ static char SccsId[] = "%W% %G%";
 #include "YapHeap.h"
 #include "YapText.h"
 #include "Yatom.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "yapio.h"
 #include <stdlib.h>
 #if HAVE_STDARG_H
--- a/os/sysbits.c
+++ b/os/sysbits.c
@ -65,7 +65,7 @@ void Yap_WinError(char *yap_error) {
  /* Error, we could not read time */
  FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
                NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-                msg, 256, NULL);
+                msg, 255, NULL);
  Yap_Error(SYSTEM_ERROR_OPERATING_SYSTEM, TermNil, "%s at %s", msg, yap_error);
 }
 #endif /* __WINDOWS__ */
@ -81,7 +81,7 @@ static bool is_directory(const char *FileName) {
  if ((vfs = vfs_owner(FileName))) {
    return vfs->isdir(vfs, FileName);
  }
-#ifdef __WINDOWS__
+#ifdef _WIN32
  DWORD dwAtts = GetFileAttributes(FileName);
  if (dwAtts == INVALID_FILE_ATTRIBUTES)
    return false;
@ -952,15 +952,15 @@ static bool initSysPath(Term tlib, Term tcommons, bool dir_done,
  {
    char *dir;
    if ((dir = Yap_RegistryGetString("library")) && is_directory(dir)) {
+      dir_done = true;
      if (!Yap_unify(tlib, MkAtomTerm(Yap_LookupAtom(dir))))
        return FALSE;
    }
-    dir_done = true;
    if ((dir = Yap_RegistryGetString("prolog_commons")) && is_directory(dir)) {
      if (!Yap_unify(tcommons, MkAtomTerm(Yap_LookupAtom(dir))))
        return FALSE;
+      commons_done = true;
    }
-    commons_done = true;
  }
  if (dir_done && commons_done)
    return TRUE;
@ -1199,9 +1199,7 @@ const char *Yap_findFile(const char *isource, const char *idef,
        source = (isource ? isource : idef);
      }
      if (source) {
-        if (source[0] == '/') {
-          abspath = true;
-        }
+          abspath = Yap_IsAbsolutePath(source);
      }
      if (!abspath && !root && ftype == YAP_BOOT_PL) {
        root = YAP_PL_SRCDIR;
@ -1251,7 +1249,7 @@ const char *Yap_findFile(const char *isource, const char *idef,
      break;

    case 4: // WIN stuff: registry
-#if __WINDOWS__
+#if __WINDOWS
      if (in_lib) {
        source = (ftype == YAP_PL || ftype == YAP_QLY ? "library" : "startup");
        source = Yap_RegistryGetString(source);
--- a/os/sysbits.h
+++ b/os/sysbits.h
@ -25,7 +25,7 @@
 #include "YapHeap.h"
 #include "YapText.h"
 #include "Yatom.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "yapio.h"

 // Win32 InputOutput Support
--- a/os/writeterm.c
+++ b/os/writeterm.c
@ -28,7 +28,7 @@ static char SccsId[] = "%W% %G%";
 #include "YapHeap.h"
 #include "YapText.h"
 #include "Yatom.h"
-#include "eval.h"
+#include "YapEval.h"
 #include "yapio.h"
 #include <stdlib.h>
 #if HAVE_STDARG_H