Merge branch 'master' of github.com:vscosta/yap-6.3

CMakeLists.txt

@@ -132,7 +132,7 @@ else()
     if (WIN32)
         List (APPEND YLIBS    $<TARGET_OBJECTS:YAP++> )
         if (WITH_PYTHON )
-            List (APPEND YLIBS    $<TARGET_OBJECTS:Obj4Py> )
+            List (APPEND YLIBS    $<TARGET_OBJECTS:Py4YAP> )
         endif()
     endif()
 

CXX/yapdb.hh

@@ -254,6 +254,7 @@ class X_API YAPPrologPredicate : public YAPPredicate {
 public:
   YAPPrologPredicate(YAPTerm t) : YAPPredicate(t){};
   YAPPrologPredicate(const char *s, arity_t arity) : YAPPredicate(s, arity){};
+  YAPPrologPredicate(YAPAtom s, arity_t arity) : YAPPredicate(s, arity){};
   /// add a new clause
   bool assertClause(YAPTerm clause, bool last = true,
 		    YAPTerm source = YAPTerm());

cmake/python.cmake

@@ -1,4 +1,4 @@
-set (Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.6 3.4 )
+set (Python_ADDITIONAL_VERSIONS 3.7 3.6 ) #3.5 3.6 3.4 )
 
 
 #  PYTHONLIBS_FOUND           - have the Python libs been found
@@ -9,9 +9,9 @@ set (Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.6 3.4 )
 #   PYTHONLIBS_VERSION_STRING  - version of the Python libs found (since CMake 2.8.8)
 ##
 #
-if (WIN32)
+if (WIN320)
     set (PYTHONLIBS_FOUND YES CACHE BOOL "MINGW/MSYS2" FORCE )
-    set (PYTHON_LIBRARY C:/msys64/mingw64/lib/libpython3.5m.dll.a CACHE FILEPATH "MINGW/MSYS2" FORCE )
+    set (PYTHON_LIBRARY C:/msys64/mingw64/lib/libpython3.6m.dll.a CACHE FILEPATH "MINGW/MSYS2" FORCE )
     set (PYTHON_LIBRARIES C:/msys64/mingw64/lib/libpython3.5m.dll.a CACHE FILEPATH "MINGW/MSYS2" FORCE )
     set (PYTHON_INCLUDE_PATH C:/msys64/mingw64/include/python3.5m CACHE PATH "MINGW/MSYS2" FORCE )
     set (PYTHON_INCLUDE_DIRS C:/msys64/mingw64/include/python3.5m CACHE PATH "MINGW/MSYS2" FORCE  )

packages/python/pl2py.c

@@ -150,19 +150,19 @@ PyObject *term_to_python(term_t t, bool eval, PyObject *o) {
       out = PyList_New(len);
       if (!out) {
 	PL_reset_term_refs(tail);
-        return CHECKNULL(t, Py_None);
+	YAPPy_ThrowError(SYSTEM_ERROR_INTERNAL, t, "list->python");
       }
 
       for (i = 0; i < len; i++) {
 	if (!PL_get_list(t, arg, t)) {
 	  PL_reset_term_refs(tail);
-          return Py_None;
+	  YAPPy_ThrowError(SYSTEM_ERROR_INTERNAL, t, "list->python");
 	}
 	a = term_to_python(arg, eval, o);
 	if (a) {
 	  if (PyList_SetItem(out, i, a) < 0) {
 	    PL_reset_term_refs(tail);
-            return Py_None;
+	    YAPPy_ThrowError(SYSTEM_ERROR_INTERNAL, t, "list->python");
 	  }
 	}
       }
@@ -170,11 +170,33 @@ PyObject *term_to_python(term_t t, bool eval, PyObject *o) {
       return CHECKNULL(t, out);
     } else {
       functor_t fun;
+      atom_t name;
+      int arity;
       PyObject *rc;
 
       if (!PL_get_functor(t, &fun)) {
 	PL_reset_term_refs(tail);
-        return CHECKNULL(t, Py_None);
+	YAPPy_ThrowError(SYSTEM_ERROR_INTERNAL, t, "list->python");
+      }
+      AOK(PL_get_name_arity(t, &name, &arity), NULL);
+      if (name == ATOM_t) {
+	int i;
+	rc = PyTuple_New(arity);
+	for (i = 0; i < len; i++) {
+	  term_t arg = PL_new_term_ref();
+	  if (!PL_get_arg(i+1, t, arg)) {
+	    PL_reset_term_refs(arg);
+	    YAPPy_ThrowError(SYSTEM_ERROR_INTERNAL, t, "t(...)->python");
+	  }
+	  PyObject *a = term_to_python(arg, eval, o);
+	  if (a) {
+	    if (PyTuple_SetItem(rc, i, a) < 0) {
+	      PL_reset_term_refs(arg);
+	      YAPPy_ThrowError(SYSTEM_ERROR_INTERNAL, t, "t(...)->python");
+	    }
+	  }
+	  PL_reset_term_refs(arg);
+	}
       }
       if (eval)
 	rc = compound_to_pyeval(t, o);
@@ -185,7 +207,7 @@ PyObject *term_to_python(term_t t, bool eval, PyObject *o) {
     }
   }
   }
-  return CHECKNULL(t, Py_None);
+  return Py_None;
 }
 
 PyObject *yap_to_python(YAP_Term t, bool eval, PyObject *o) {
@@ -209,3 +231,7 @@ PyObject *deref_term_to_python(term_t t) {
   }
   return term_to_python(t, false, NULL);
 }
+
+
+void YAPPy_ThrowError__(const char *file, const char *function, int lineno,
+			yap_error_number type, term_t where, ...);

packages/python/pybips.c

@@ -698,7 +698,7 @@ static PyObject *structseq_repr(PyObject *iobj) {
 
 PyObject *term_to_nametuple(const char *s, arity_t arity, PyObject *tuple) {
   PyObject *o;
-#if PY_MAJOR_VERSION >= 30
+#if PY_MAJOR_VERSION >= 3
   PyTypeObject *typp;
   PyObject *key = PyUnicode_FromString(s);
   if (py_F2P && PyDict_Contains(py_F2P, key)) {
@@ -729,7 +729,6 @@ PyObject *term_to_nametuple(const char *s, arity_t arity, PyObject *tuple) {
   }
   o = PyStructSequence_New(typp);
   Py_INCREF(typp);
-  fprintf(stderr, "<<< %p\n",typp);
   arity_t i;
   for (i = 0; i < arity; i++) {
     PyObject *pArg = PyTuple_GET_ITEM(tuple, i);
@@ -750,7 +749,7 @@ PyObject *term_to_nametuple(const char *s, arity_t arity, PyObject *tuple) {
 #endif
 }
 
-static PyObject *bip_range(term_t t) {
+ static PyObject *bip_range(term_t t) {
    long ilow = 0, ihigh = 0, istep = 1;
    long bign;
    Py_ssize_t i, n;
@@ -805,9 +804,9 @@ static PyObject *bip_range(term_t t) {
      ilow += istep;
    }
    return v;
-}
+ }
 
-static bool copy_to_dictionary(PyObject *dict, term_t targ, term_t taux,
+ static bool copy_to_dictionary(PyObject *dict, term_t targ, term_t taux,
 				bool eval) {
    PyObject *lhs, *rhs;
    term_t tleft = PL_new_term_ref(), tright = PL_new_term_ref();
@@ -841,9 +840,9 @@ static bool copy_to_dictionary(PyObject *dict, term_t targ, term_t taux,
    // PyObject_Print(dict, stderr, 0); fprintf(stderr,"\n");
    // Py_DECREF(lhs);
    // Py_DECREF(rhs);
-}
+ }
 
-PyObject *compound_to_data(term_t t, PyObject *o, functor_t fun, bool exec) {
+ PyObject *compound_to_data(term_t t, PyObject *o, functor_t fun, bool exec) {
    atom_t name;
    int len;
 
@@ -1016,9 +1015,9 @@ PyObject *compound_to_data(term_t t, PyObject *o, functor_t fun, bool exec) {
 	 return dict;
        }
        return o;
-}
+     }
 
-PyObject *compound_to_pytree(term_t t, PyObject *context) {
+     PyObject *compound_to_pytree(term_t t, PyObject *context) {
        PyObject *o = py_Main, *no;
        functor_t fun;
        atom_t name;
@@ -1072,9 +1071,9 @@ PyObject *compound_to_pytree(term_t t, PyObject *context) {
 	 }
 	 return term_to_nametuple(s, arity, out);
        }
-}
+     }
 
-PyObject *compound_to_pyeval(term_t t, PyObject *context) {
+     PyObject *compound_to_pyeval(term_t t, PyObject *context) {
        PyObject *o = NULL, *no;
        atom_t name;
        int arity;
@@ -1239,4 +1238,4 @@ PyObject *compound_to_pyeval(term_t t, PyObject *context) {
 
 	 return rc;
        }
-}
+     }

packages/python/swig/CMakeLists.txt

@@ -24,9 +24,7 @@ SET_SOURCE_FILES_PROPERTIES(../../swig/yap.i PROPERTIES SWIG_MODULE_NAME yap)
 
 if (WIN32)
 
-set (SYS_DLLS ${GMP_LIBRARIES})
+set (SYS_DLLS ${GMP_LIBRARIES}  c:/msys64/mingw64/bin/libgmp-10.dll)
-
-set (SYS_DLLS c:/msys64/mingw64/bin/libgmp-10.dll)
 
 endif()
 

packages/python/swig/setup.py

@@ -3,6 +3,8 @@
 See:
 https://packaging.python.org/en/latest/distributing.html
 https://github.com/pypa/sampleproject
+
+
 """
 
 # Always prefer setuptools over distutils

pl/modules.yap

@@ -789,4 +789,4 @@ module_state :-
 	fail.
 module_state.
 
-// @}
+%% @}