diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

smallbugs

Browse Source
This commit is contained in:
Vitor Santos Costa
2017-06-18 11:14:55 +01:00
parent 31f1c25ee7
commit 6b545c8f71
7 changed files with 338 additions and 373 deletions
Download Patch File Download Diff File Expand all files Collapse all files

161
packages/python/pl2py.c
View File

@@ -4,42 +4,37 @@
extern PyObject *py_Local, *py_Global;
PyObject *YE(term_t t, int line, const char *file, const char *code)
{
PyObject *YE(term_t t, int line, const char *file, const char *code) {
char buf[1024];
YAP_WriteBuffer(YAP_GetFromSlot(t), buf, 1023, 0);
fprintf(stderr, "**** Warning,%s@%s:%d: failed on expression %s\n", code, file, line, buf);
fprintf(stderr, "**** Warning,%s@%s:%d: failed on expression %s\n", code,
file, line, buf);
return NULL;
}
void YEM(const char *exp, int line, const char *file, const char *code)
{
fprintf(stderr, "**** Warning,%s@%s:%d: failed while executing %s\n", code, file, line, exp);
void YEM(const char *exp, int line, const char *file, const char *code) {
fprintf(stderr, "**** Warning,%s@%s:%d: failed while executing %s\n", code,
file, line, exp);
}
static PyObject *s_to_python( const char *s, bool eval, PyObject *p0)
{
static PyObject *s_to_python(const char *s, bool eval, PyObject *p0) {
PyObject *o;
if (eval)
{
o = PythonLookup(s,p0);
/* if (!o)
return o;
*/
}
else
{
o = PythonLookupSpecial(s);
}
if (o)
{
Py_INCREF(o);
return CHECKNULL(YAP_MkStringTerm(s), o);
} else {
PyObject *pobj = PyUnicode_DecodeUTF8(s, strlen(s), NULL);
return pobj;
}
if (eval) {
o = PythonLookup(s, p0);
/* if (!o)
return o;
*/
} else {
o = PythonLookupSpecial(s);
}
if (o) {
Py_INCREF(o);
return CHECKNULL(YAP_MkStringTerm(s), o);
} else {
PyObject *pobj = PyUnicode_DecodeUTF8(s, strlen(s), NULL);
return pobj;
}
}
/**
@@ -50,19 +45,18 @@ static PyObject *s_to_python( const char *s, bool eval, PyObject *p0)
*
* @return a Python object descriptor or NULL if failed
*/
X_API PyObject *string_to_python( const char *s, bool eval, PyObject *p0)
{
char *buf = malloc(strlen(s)+1), *child;
while((child = strchr(s,'.')) != NULL ) {
X_API PyObject *string_to_python(const char *s, bool eval, PyObject *p0) {
char *buf = malloc(strlen(s) + 1), *child;
while ((child = strchr(s, '.')) != NULL) {
size_t len = child - s;
strncpy(buf,s,len);
buf[len]='\0';
strncpy(buf, s, len);
buf[len] = '\0';
p0 = s_to_python(buf, eval, p0);
s = child+1;
s = child + 1;
}
return s_to_python(s, eval, p0);
}
/**
* term_to_python translates and evaluates from Prolog to Python
*
@@ -71,77 +65,58 @@ X_API PyObject *string_to_python( const char *s, bool eval, PyObject *p0)
*
* @return a Python object descriptor or NULL if failed
*/
PyObject *term_to_python(term_t t, bool eval, PyObject *o)
{
PyObject *term_to_python(term_t t, bool eval, PyObject *o) {
// o≈
YAP_Term yt = YAP_GetFromSlot(t);
// Yap_DebugPlWriteln(yt);
switch (PL_term_type(t))
{
case PL_VARIABLE:
{
if (t == 0)
{
switch (PL_term_type(t)) {
case PL_VARIABLE: {
if (t == 0) {
Yap_ThrowError(SYSTEM_ERROR_INTERNAL, yt, "in term_to_python");
}
PyObject *out = PyTuple_New(1);
PyTuple_SET_ITEM(out, 0, PyLong_FromLong(t));
return term_to_nametuple("v", 1, out);
};
case PL_ATOM:
{
case PL_ATOM: {
YAP_Atom at = YAP_AtomOfTerm(yt);
const char *s;
s = YAP_AtomName(at);
if (eval)
{
if (eval) {
o = PythonLookup(s, o);
/* if (!o)
return o;
return o;
*/
}
else
{
} else {
o = PythonLookupSpecial(s);
}
if (o)
{
if (o) {
Py_INCREF(o);
return CHECKNULL(t, o);
}
}
case PL_STRING:
{
case PL_STRING: {
const char *s = NULL;
if (YAP_IsAtomTerm(yt))
{
if (YAP_IsAtomTerm(yt)) {
s = YAP_AtomName(YAP_AtomOfTerm(yt));
}
else if (YAP_IsStringTerm(yt))
{
} else if (YAP_IsStringTerm(yt)) {
s = YAP_StringOfTerm(yt);
}
else
{
} else {
return CHECKNULL(t, NULL);
}
#if PY_MAJOR_VERSION < 3
if (proper_ascii_string(s))
{
if (proper_ascii_string(s)) {
PyObject *o = PyString_FromStringAndSize(s, strlen(s));
return CHECKNULL(t, o);
}
else
} else
#endif
{
PyObject *pobj = PyUnicode_DecodeUTF8(s, strlen(s), NULL);
return CHECKNULL(t, pobj);
}
}
break;
case PL_INTEGER:
{
} break;
case PL_INTEGER: {
int64_t j;
if (!PL_get_int64_ex(t, &j))
return CHECKNULL(t, NULL);
@@ -154,8 +129,7 @@ PyObject *term_to_python(term_t t, bool eval, PyObject *o)
#endif
}
case PL_FLOAT:
{
case PL_FLOAT: {
PyObject *out;
double fl;
if (!PL_get_float(t, &fl))
@@ -163,45 +137,39 @@ PyObject *term_to_python(term_t t, bool eval, PyObject *o)
out = PyFloat_FromDouble(fl);
return CHECKNULL(t, out);
}
default:
{
default: {
term_t tail = PL_new_term_ref(), arg;
size_t len, i;
if (PL_skip_list(t, tail, &len) && PL_get_nil(tail))
{
if (PL_skip_list(t, tail, &len) && PL_get_nil(tail)) {
PyObject *out, *a;
arg = tail;
out = PyList_New(len);
if (!out)
if (!out) {
PL_reset_term_refs(tail);
return CHECKNULL(t, Py_None);
}
for (i = 0; i < len; i++)
{
if (!PL_get_list(t, arg, t))
{
for (i = 0; i < len; i++) {
if (!PL_get_list(t, arg, t)) {
PL_reset_term_refs(tail);
return Py_None;
}
a = term_to_python(arg, eval, o);
if (a )
{
if (PyList_SetItem(out, i, a) < 0)
{
return Py_None;
if (a) {
if (PyList_SetItem(out, i, a) < 0) {
PL_reset_term_refs(tail);
return Py_None;
}
}
}
PL_reset_term_refs(tail);
return CHECKNULL(t, out);
}
else
{
} else {
functor_t fun;
PyObject *rc;
if (!PL_get_functor(t, &fun))
{
if (!PL_get_functor(t, &fun)) {
PL_reset_term_refs(tail);
return CHECKNULL(t, Py_None);
}
@@ -217,8 +185,7 @@ PyObject *term_to_python(term_t t, bool eval, PyObject *o)
return CHECKNULL(t, Py_None);
}
PyObject *yap_to_python(YAP_Term t, bool eval, PyObject *o)
{
PyObject *yap_to_python(YAP_Term t, bool eval, PyObject *o) {
if (t == 0)
return NULL;
term_t yt = YAP_InitSlot(t);
@@ -227,13 +194,11 @@ PyObject *yap_to_python(YAP_Term t, bool eval, PyObject *o)
return o;
}
PyObject *deref_term_to_python(term_t t)
{
PyObject *deref_term_to_python(term_t t) {
// Yap_DebugPlWrite(YAP_GetFromSlot(t)); fprintf(stderr, " here I
// am\n");
YAP_Term yt = YAP_GetFromSlot(t);
if (YAP_IsVarTerm(yt))
{
if (YAP_IsVarTerm(yt)) {
char s[32];
char *o = YAP_WriteBuffer(yt, s, 31, 0);
PyObject *p = PyUnicode_FromString(o);