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

python

Browse Source
This commit is contained in:
Vitor Santos Costa 2017-12-20 00:29:15 +00:00
parent 4a5002091f
commit 814aa2bd4c
10 changed files with 796 additions and 960 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
C/yap-args.c
View File

@ -146,7 +146,8 @@ static void do_bootfile(const char *b_file USES_REGS) {
* `@` query user option. * `@` query user option.
* *
*/ */
const char *rootdirs[] = {"[root]", "(execdir)..", "/usr/local", "~", NULL}; const char *rootdirs[] = {"[root]", "(execdir)..", "/usr/local", "/", "/usr",
"/opt", "$HOME", "$PWD", NULL};
const char *bindirs[] = {"[bin]", "(root)bin", NULL}; const char *bindirs[] = {"[bin]", "(root)bin", NULL};
@ -162,17 +163,17 @@ const char *sharedirs[] = {
#endif #endif
"[share]", "(root)share", NULL}; "[share]", "(root)share", NULL};
const char *dlldirs[] = {"$YAPLIBDIR", "(lib)Yap", ".", NULL}; const char *dlldirs[] = {"$YAPLIBDIR", "(lib)Yap", "$PWD", NULL};
const char *ssdirs[] = {".", "$YAPLIBDIR", "(lib)Yap", NULL}; const char *ssdirs[] = {"$PWD", "$YAPLIBDIR", "(lib)Yap", NULL};
const char *pldirs[] = {"$YAPSHAREDIR", "?library", "(share)Yap", ".", NULL}; const char *pldirs[] = {"$YAPSHAREDIR", "?library", "(share)Yap", "$PWD", NULL};
const char *bootpldirs[] = {"(pl)pl", ".", NULL}; const char *bootpldirs[] = {"(pl)pl", "$PWD", NULL};
const char *bootstrappldirs[] = {YAP_PL_SRCDIR, NULL}; const char *bootstrappldirs[] = {YAP_PL_SRCDIR, NULL};
const char *commonsdirs[] = {"(share)PrologCommons", ".", NULL}; const char *commonsdirs[] = {"(share)PrologCommons", "$PWD", NULL};
const char *ssnames[] = {"@SavedState", YAP_STARTUP, "startup.yss", NULL}; const char *ssnames[] = {"@SavedState", YAP_STARTUP, "startup.yss", NULL};
@ -319,7 +320,6 @@ static const char *find_directory(YAP_init_args *iap, const char *paths[],
} }
int i = 0; int i = 0;
while ((inp = paths[i++]) != NULL) { while ((inp = paths[i++]) != NULL) {
printf("%s\n", inp);
out[0] = '\0'; out[0] = '\0';
char *o = location(iap, inp, out), *no; char *o = location(iap, inp, out), *no;
if (o && o[0] && Yap_isDirectory(o)) { if (o && o[0] && Yap_isDirectory(o)) {
@ -330,7 +330,7 @@ static const char *find_directory(YAP_init_args *iap, const char *paths[],
int j = 0; int j = 0;
while ((p = names[j++])) { while ((p = names[j++])) {
char *io = o + s; char *io = o + s;
printf("-> %s\n", o); printf("%s -> %s\n", inp, o);
if ((no = location(iap, p, io)) && io[0] != '\0' && Yap_Exists(o)) if ((no = location(iap, p, io)) && io[0] != '\0' && Yap_Exists(o))
return pop_output_text_stack(lvl, realpath(o, full)); return pop_output_text_stack(lvl, realpath(o, full));
} }
@ -347,29 +347,25 @@ static const char *find_directory(YAP_init_args *iap, const char *paths[],
static void Yap_set_locations(YAP_init_args *iap) { static void Yap_set_locations(YAP_init_args *iap) {
#if CONDA_BUILD #if CONDA_BUILD
if (!getenv("DESTDIR")) { if (!getenv("DESTDIR")) {
int lvl = push_text_stack();
const char *path = getenv("PATH");
char *o = &path[0L], *no, *p;
char *buf = Malloc(YAP_FILENAME_MAX + 1); char *buf = Malloc(YAP_FILENAME_MAX + 1);
const char *o = Yap_FindExecutable(); o = Malloc(strlen(path) + 1);
if (!o) strcpy(o, path);
return; if ((p = strstr(o, "anaconda"))) {
o = Yap_AbsoluteFile(o, buf, false); char *q = p + strlen("anaconda"), *r = strstr(q, "/bin");
Int i = strlen(o); if (r - q > 0 && r - q < 10 && (r[4] == ':' || r[4] == '\0')) {
while (--i) { r[0] = '\0';
if (Yap_dir_separator((int)o[i])) q = strrchr(o, ':');
break; if (q)
o = q + 1;
} else
o = NULL;
} }
if (i == 0) { setenv("DESTDIR", "/", 1); } Yap_ROOTDIR = pop_output_text_stack(lvl, o);
else {
while (--i) {
if (Yap_dir_separator((int)o[i]))
break;
}
if (i == 0) { setenv("DESTDIR", "/", 1); }
else { setenv("DESTDIR", o, 1); }
}
setenv("DESTDIR", buf, 1);
} }
if (!Yap_ROOTDIR)
#endif #endif
Yap_ROOTDIR = find_directory(iap, rootdirs, NULL); Yap_ROOTDIR = find_directory(iap, rootdirs, NULL);
Yap_LIBDIR = find_directory(iap, libdirs, NULL); Yap_LIBDIR = find_directory(iap, libdirs, NULL);
@ -384,7 +380,8 @@ static void Yap_set_locations(YAP_init_args *iap) {
else else
Yap_BOOTFILE = find_directory(iap, bootpldirs, plnames); Yap_BOOTFILE = find_directory(iap, bootpldirs, plnames);
if (Yap_ROOTDIR) if (Yap_ROOTDIR)
setAtomicGlobalPrologFlag(HOME_FLAG, MkAtomTerm(Yap_LookupAtom(Yap_ROOTDIR))); setAtomicGlobalPrologFlag(HOME_FLAG,
MkAtomTerm(Yap_LookupAtom(Yap_ROOTDIR)));
if (Yap_PLDIR) if (Yap_PLDIR)
setAtomicGlobalPrologFlag(PROLOG_LIBRARY_DIRECTORY_FLAG, setAtomicGlobalPrologFlag(PROLOG_LIBRARY_DIRECTORY_FLAG,
MkAtomTerm(Yap_LookupAtom(Yap_PLDIR))); MkAtomTerm(Yap_LookupAtom(Yap_PLDIR)));

444
CXX/yapi.cpp
View File

File diff suppressed because it is too large Load Diff

212
CXX/yapq.hh
View File

@ -9,8 +9,8 @@
* *
* @{ * @{
* *
* These classes wrap engine and query. An engine is an environment where we can rum * These classes wrap engine and query. An engine is an environment where we
* Prolog, that is, where we can run queries. * can rum Prolog, that is, where we can run queries.
* *
* Also, supports callbacks and engine configuration. * Also, supports callbacks and engine configuration.
* *
@ -35,8 +35,7 @@ class X_API YAPPredicate;
* interface to a YAP Query; * interface to a YAP Query;
* uses an SWI-like status info internally. * uses an SWI-like status info internally.
*/ */
class X_API YAPQuery : public YAPPredicate class X_API YAPQuery : public YAPPredicate {
{
bool q_open; bool q_open;
int q_state; int q_state;
yhandle_t q_g, q_handles; yhandle_t q_g, q_handles;
@ -62,15 +61,14 @@ class X_API YAPQuery : public YAPPredicate
q_handles = LOCAL_CurSlot; q_handles = LOCAL_CurSlot;
}; };
void openQuery();
void openQuery( Term *ts);
PredEntry *rewriteUndefQuery(); PredEntry *rewriteUndefQuery();
public: public:
YAPQuery() { YAPQuery() {
goal = TermTrue; goal = TermTrue;
openQuery( nullptr); openQuery();
}; };
/// main constructor, uses a predicate and an array of terms /// main constructor, uses a predicate and an array of terms
/// ///
@ -95,26 +93,34 @@ YAPQuery() {
/// It is given a string, calls the parser and obtains a Prolog term that /// It is given a string, calls the parser and obtains a Prolog term that
/// should be a callable /// should be a callable
/// goal. /// goal.
inline YAPQuery(const char *s) : YAPPredicate(s, tgoal, tnames) inline YAPQuery(const char *s) : YAPPredicate(s, tgoal, tnames) {
{
CELL *qt = nullptr; CELL *qt = nullptr;
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "got game %d", __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "got game %d",
LOCAL_CurSlot); LOCAL_CurSlot);
if (!ap) if (!ap)
return; return;
__android_log_print(ANDROID_LOG_INFO, "YAPDroid", "%s", names.text()); __android_log_print(ANDROID_LOG_INFO, "YAPDroid", "%s", names.text());
goal = YAPTerm(tgoal);
if (IsPairTerm(tgoal)) { if (IsPairTerm(tgoal)) {
qt = RepPair(tgoal); qt = RepPair(tgoal);
tgoal = Yap_MkApplTerm(Yap_MkFunctor(Yap_LookupAtom("consult"), 1),1,qt); tgoal = Yap_MkApplTerm(FunctorCsult, 1, qt);
} else if (IsApplTerm(tgoal)) { ap = RepPredProp(PredPropByFunc(FunctorCsult, TermProlog));
}
goal = YAPTerm(tgoal);
if (IsApplTerm(tgoal)) {
Functor f = FunctorOfTerm(tgoal); Functor f = FunctorOfTerm(tgoal);
if (!IsExtensionFunctor(f)) { if (!IsExtensionFunctor(f)) {
if (!IsExtensionFunctor(f)) {
arity_t arity = ap->ArityOfPE;
if (arity) {
qt = RepAppl(tgoal) + 1; qt = RepAppl(tgoal) + 1;
for (arity_t i = 0; i < arity; i++)
XREGS[i + 1] = qt[i];
}
}
} }
} }
names = YAPPairTerm(tnames); names = YAPPairTerm(tnames);
openQuery(qt); openQuery();
}; };
// inline YAPQuery() : YAPPredicate(s, tgoal, tnames) // inline YAPQuery() : YAPPredicate(s, tgoal, tnames)
// { // {
@ -157,15 +163,13 @@ void cut();
Term namedVars() { return names.term(); }; Term namedVars() { return names.term(); };
YAPPairTerm namedVarTerms() { return names; }; YAPPairTerm namedVarTerms() { return names; };
/// query variables, but copied out /// query variables, but copied out
std::vector<Term> namedVarsVector() { std::vector<Term> namedVarsVector() { return names.listToArray(); };
return names.listToArray(); };
/// convert a ref to a binding. /// convert a ref to a binding.
YAPTerm getTerm(yhandle_t t); YAPTerm getTerm(yhandle_t t);
/// simple YAP Query; /// simple YAP Query;
/// just calls YAP and reports success or failure, Useful when we just /// just calls YAP and reports success or failure, Useful when we just
/// want things done, eg YAPCommand("load_files(library(lists), )") /// want things done, eg YAPCommand("load_files(library(lists), )")
inline bool command() inline bool command() {
{
bool rc = next(); bool rc = next();
close(); close();
return rc; return rc;
@ -177,8 +181,7 @@ inline bool command()
/// This class implements a callback Prolog-side. It will be inherited by the /// This class implements a callback Prolog-side. It will be inherited by the
/// Java or Python /// Java or Python
/// class that actually implements the callback. /// class that actually implements the callback.
class X_API YAPCallback class X_API YAPCallback {
{
public: public:
virtual ~YAPCallback() {} virtual ~YAPCallback() {}
virtual void run() { LOG("callback"); } virtual void run() { LOG("callback"); }
@ -188,7 +191,6 @@ public:
/// @brief Setup all arguments to a new engine /// @brief Setup all arguments to a new engine
struct X_API YAPEngineArgs : YAP_init_args { struct X_API YAPEngineArgs : YAP_init_args {
public: public:
YAPEngineArgs() : yap_boot_params() { YAPEngineArgs() : yap_boot_params() {
char s[32]; char s[32];
strcpy(s, "startup.yss"); strcpy(s, "startup.yss");
@ -199,174 +201,93 @@ public:
#endif #endif
}; };
inline void setEmbedded( bool fl ) inline void setEmbedded(bool fl) { Embedded = fl; };
{
Embedded = fl;
};
inline bool getEmbedded( ) inline bool getEmbedded() { return Embedded; };
{
return Embedded;
};
inline void setStackSize( bool fl ) inline void setStackSize(bool fl) { StackSize = fl; };
{
StackSize = fl;
};
inline bool getStackSize( ) inline bool getStackSize() { return StackSize; };
{
return StackSize;
};
inline void setTrailSize( bool fl ) inline void setTrailSize(bool fl) { TrailSize = fl; };
{
TrailSize = fl;
};
inline bool getTrailSize( ) inline bool getTrailSize() { return TrailSize; };
{
return TrailSize;
};
inline bool getMStackSize( ) inline bool getMStackSize() { return StackSize; };
{
return StackSize;
};
inline void setMaxTrailSize( bool fl ) inline void setMaxTrailSize(bool fl) { MaxTrailSize = fl; };
{
MaxTrailSize = fl;
};
inline bool getMaxTrailSize( ) inline bool getMaxTrailSize() { return MaxTrailSize; };
{
return MaxTrailSize;
};
inline void setYapLibDir( const char * fl ) inline void setYapLibDir(const char *fl) {
{
YapLibDir = (const char *)malloc(strlen(fl) + 1); YapLibDir = (const char *)malloc(strlen(fl) + 1);
strcpy((char *)YapLibDir, fl); strcpy((char *)YapLibDir, fl);
}; };
inline const char * getYapLibDir( ) inline const char *getYapLibDir() { return YapLibDir; };
{
return YapLibDir;
};
inline void setYapShareDir( const char * fl ) inline void setYapShareDir(const char *fl) {
{
YapShareDir = (const char *)malloc(strlen(fl) + 1); YapShareDir = (const char *)malloc(strlen(fl) + 1);
strcpy((char *)YapShareDir, fl); strcpy((char *)YapShareDir, fl);
}; };
inline const char * getYapShareDir( ) inline const char *getYapShareDir() { return YapShareDir; };
{
return YapShareDir;
};
inline void setSavedState( const char * fl ) inline void setSavedState(const char *fl) {
{
SavedState = (const char *)malloc(strlen(fl) + 1); SavedState = (const char *)malloc(strlen(fl) + 1);
strcpy((char *)SavedState, fl); strcpy((char *)SavedState, fl);
}; };
inline const char * getSavedState( ) inline const char *getSavedState() { return SavedState; };
{
return SavedState;
};
inline void setYapPrologBootFile( const char * fl ) inline void setYapPrologBootFile(const char *fl) {
{
YapPrologBootFile = (const char *)malloc(strlen(fl) + 1); YapPrologBootFile = (const char *)malloc(strlen(fl) + 1);
strcpy((char *)YapPrologBootFile, fl); strcpy((char *)YapPrologBootFile, fl);
}; };
inline const char * getYapPrologBootFile( ) inline const char *getYapPrologBootFile() { return YapPrologBootFile; };
{
return YapPrologBootFile;
};
inline void setYapPrologGoal( const char * fl ) inline void setYapPrologGoal(const char *fl) { YapPrologGoal = fl; };
{
YapPrologGoal = fl;
};
inline const char * getYapPrologGoal( ) inline const char *getYapPrologGoal() { return YapPrologGoal; };
{
return YapPrologGoal;
};
inline void setYapPrologTopLevelGoal( const char * fl ) inline void setYapPrologTopLevelGoal(const char *fl) {
{
YapPrologTopLevelGoal = fl; YapPrologTopLevelGoal = fl;
}; };
inline const char * getYapPrologTopLevelGoal( ) inline const char *getYapPrologTopLevelGoal() {
{
return YapPrologTopLevelGoal; return YapPrologTopLevelGoal;
}; };
inline void setHaltAfterConsult( bool fl ) inline void setHaltAfterConsult(bool fl) { HaltAfterConsult = fl; };
{
HaltAfterConsult = fl;
};
inline bool getHaltAfterConsult( ) inline bool getHaltAfterConsult() { return HaltAfterConsult; };
{
return HaltAfterConsult;
};
inline void setFastBoot( bool fl ) inline void setFastBoot(bool fl) { FastBoot = fl; };
{
FastBoot = fl;
};
inline bool getFastBoot( ) inline bool getFastBoot() { return FastBoot; };
{
return FastBoot;
};
#if __ANDROID__ #if __ANDROID__
//> export ResoourceManager //> export ResoourceManager
inline void setAssetManager( AAssetManager *mgr ) inline void setAssetManager(AAssetManager *mgr) { assetManager = mgr; };
{
assetManager = mgr;
};
#endif #endif
inline void setArgc( int fl ) inline void setArgc(int fl) { Argc = fl; };
{
Argc = fl;
};
inline int getArgc( ) inline int getArgc() { return Argc; };
{
return Argc;
};
inline void setArgv( char ** fl ) inline void setArgv(char **fl) { Argv = fl; };
{
Argv = fl;
};
inline char ** getArgv( ) inline char **getArgv() { return Argv; };
{
return Argv;
}; };
};
/** /**
* @brief YAP Engine: takes care of the execution environment * @brief YAP Engine: takes care of the execution environment
where we can go executing goals. where we can go executing goals.
* *
* *
*/ */
class YAPEngine class YAPEngine {
{
private: private:
YAPEngineArgs *engine_args; YAPEngineArgs *engine_args;
YAPCallback *_callback; YAPCallback *_callback;
@ -377,8 +298,7 @@ private:
public: public:
/// construct a new engine; may use a variable number of arguments /// construct a new engine; may use a variable number of arguments
YAPEngine(YAPEngineArgs *cargs) YAPEngine(YAPEngineArgs *cargs) {
{
engine_args = cargs; engine_args = cargs;
// doInit(cargs->boot_file_type); // doInit(cargs->boot_file_type);
doInit(YAP_QLY); doInit(YAP_QLY);
@ -391,16 +311,14 @@ private:
/// remove current callback /// remove current callback
void delYAPCallback() { _callback = 0; }; void delYAPCallback() { _callback = 0; };
/// set a new callback /// set a new callback
void setYAPCallback(YAPCallback *cb) void setYAPCallback(YAPCallback *cb) {
{
delYAPCallback(); delYAPCallback();
_callback = cb; _callback = cb;
}; };
/// execute the callback. /// execute the callback.
////void run() { if (_callback) _callback.run(); } ////void run() { if (_callback) _callback.run(); }
/// execute the callback with a text argument. /// execute the callback with a text argument.
void run(char *s) void run(char *s) {
{
if (_callback) if (_callback)
_callback->run(s); _callback->run(s);
} }
@ -427,25 +345,20 @@ private:
bool mgoal(Term t, Term tmod); bool mgoal(Term t, Term tmod);
/// current directory for the engine /// current directory for the engine
bool goal(Term t) bool goal(Term t) { return mgoal(t, CurrentModule); }
{
return mgoal(t, CurrentModule);
}
/// reset Prolog state /// reset Prolog state
void reSet(); void reSet();
/// assune that there are no stack pointers, just release memory /// assune that there are no stack pointers, just release memory
// for last execution // for last execution
void release(); void release();
const char *currentDir() const char *currentDir() {
{
char dir[1024]; char dir[1024];
std::string s = Yap_getcwd(dir, 1024 - 1); std::string s = Yap_getcwd(dir, 1024 - 1);
return s.c_str(); return s.c_str();
}; };
/// report YAP version as a string /// report YAP version as a string
const char *version() const char *version() {
{
std::string s = Yap_version(); std::string s = Yap_version();
return s.c_str(); return s.c_str();
}; };
@ -457,14 +370,13 @@ private:
Term fun(YAPTerm t) { return fun(t.term()); }; Term fun(YAPTerm t) { return fun(t.term()); };
//> set a StringFlag, usually a path //> set a StringFlag, usually a path
//> //>
bool setStringFlag(std::string arg, std::string path) bool setStringFlag(std::string arg, std::string path) {
{ return setYapFlag(MkAtomTerm(Yap_LookupAtom(arg.data())),
return setYapFlag(MkAtomTerm(Yap_LookupAtom(arg.data())), MkAtomTerm(Yap_LookupAtom(path.data()))); MkAtomTerm(Yap_LookupAtom(path.data())));
}; };
Term top_level(std::string s); Term top_level(std::string s);
Term next_answer(YAPQuery *&Q); Term next_answer(YAPQuery *&Q);
}; };
#endif /* YAPQ_HH */ #endif /* YAPQ_HH */

6
os/fmem.c
View File

@ -170,9 +170,9 @@ open_mem_read_stream(USES_REGS1) /* $open_mem_read_stream(+List,-Stream) */
if (!buf) { if (!buf) {
return false; return false;
} }
buf = pop_output_text_stack(l, buf);
sno = Yap_open_buf_read_stream(buf, strlen(buf) + 1, &LOCAL_encoding, sno = Yap_open_buf_read_stream(buf, strlen(buf) + 1, &LOCAL_encoding,
MEM_BUF_MALLOC); MEM_BUF_MALLOC);
pop_text_stack(l);
t = Yap_MkStream(sno); t = Yap_MkStream(sno);
return Yap_unify(ARG2, t); return Yap_unify(ARG2, t);
} }
@ -292,9 +292,9 @@ void Yap_MemOps(StreamDesc *st) {
st->stream_getc = PlGetc; st->stream_getc = PlGetc;
} }
bool Yap_CloseMemoryStream(int sno) { bool Yap_CloseMemoryStream(int sno) {
if ((GLOBAL_Stream[sno].status & Output_Stream_f) && GLOBAL_Stream[sno].file) { if ((GLOBAL_Stream[sno].status & Output_Stream_f) &&
GLOBAL_Stream[sno].file) {
fflush(GLOBAL_Stream[sno].file); fflush(GLOBAL_Stream[sno].file);
fclose(GLOBAL_Stream[sno].file); fclose(GLOBAL_Stream[sno].file);
if (GLOBAL_Stream[sno].status & FreeOnClose_Stream_f) if (GLOBAL_Stream[sno].status & FreeOnClose_Stream_f)

11
packages/python/python.c
View File

@ -1,6 +1,5 @@
#include "py4yap.h" #include "py4yap.h"
#include <VFS.h> #include <VFS.h>
@ -27,7 +26,8 @@ PyObject *py_ModDict;
VFS_t pystream; VFS_t pystream;
static void *py_open(VFS_t *me, int sno, const char *name, const char *io_mode) { static void *py_open(VFS_t *me, int sno, const char *name,
const char *io_mode) {
#if HAVE_STRCASESTR #if HAVE_STRCASESTR
if (strcasestr(name, "//python/") == name) if (strcasestr(name, "//python/") == name)
name += strlen("//python/"); name += strlen("//python/");
@ -57,7 +57,6 @@ static bool py_close(int sno) {
return v; return v;
} }
static int py_put(int sno, int ch) { static int py_put(int sno, int ch) {
// PyObject *pyw; // buffer // PyObject *pyw; // buffer
// int pyw_kind; // int pyw_kind;
@ -69,9 +68,11 @@ static int py_put(int sno, int ch) {
PyObject *err, *fput = PyObject_GetAttrString(st->u.private_data, "write"); PyObject *err, *fput = PyObject_GetAttrString(st->u.private_data, "write");
s[0] = ch; s[0] = ch;
s[1] = '\0'; s[1] = '\0';
PyObject_CallFunctionObjArgs(fput, PyUnicode_FromString(s), NULL); PyObject_CallFunctionObjArgs(fput, PyBytes_FromString(s), NULL);
if ((err = PyErr_Occurred())) { if ((err = PyErr_Occurred())) {
PyErr_SetString(err, "Error in put\n");// %s:%s:%d!\n", __FILE__, __FUNCTION__, __LINE__); PyErr_SetString(
err,
"Error in put\n"); // %s:%s:%d!\n", __FILE__, __FUNCTION__, __LINE__);
} }
return ch; return ch;
} }

8
packages/python/swig/prolog/yapi.yap
View File

@ -61,13 +61,13 @@ argi(N,I,I1) :-
I1 is I+1. I1 is I+1.
python_query( Self, String ) :- python_query( Self, String ) :-
yap_flag(typein_module, Mod),
atomic_to_term( String, Goal, VarNames ), atomic_to_term( String, Goal, VarNames ),
query_to_answer( Mod:Goal, VarNames, Status, Bindings), query_to_answer( Goal, VarNames, Status, Bindings),
maplist(in_dict(Self.bindings), Bindings), Self.port := Status,
write_query_answer( Bindings ), write_query_answer( Bindings ),
nl(user_error), nl(user_error),
Self.port := Status. Self.bindings := {},
maplist(in_dict(Self.bindings), Bindings).
in_dict(Dict, var([V0,V|Vs])) :- !, in_dict(Dict, var([V0,V|Vs])) :- !,
Dict[V] := V0, Dict[V] := V0,

126
packages/python/yap_kernel/yap_ipython/core/interactiveshell.py
View File

@ -1,6 +1,7 @@
import os import os
import sys import sys
import abc import abc
import math
import yap4py.yapi import yap4py.yapi
from IPython.core import interactiveshell from IPython.core import interactiveshell
@ -14,6 +15,7 @@ from pygments import highlight
from pygments.lexers.prolog import PrologLexer from pygments.lexers.prolog import PrologLexer
from pygments.formatters import HtmlFormatter from pygments.formatters import HtmlFormatter
import pdb
from collections import namedtuple from collections import namedtuple
@ -110,9 +112,9 @@ class YAPInteractive(InteractiveShell):
self.yapeng.goal(use_module(library("jupyter"))) self.yapeng.goal(use_module(library("jupyter")))
self.q = None self.q = None
self.run = False self.run = False
self.os = ""
self.port = None self.port = None
self.init_yap_completer() self.init_yap_completer()
self.init_syntax_highlighting()
def init_syntax_highlighting(self, changes=None): def init_syntax_highlighting(self, changes=None):
# Python source parser/formatter for syntax highlighting # Python source parser/formatter for syntax highlighting
@ -206,9 +208,9 @@ class YAPInteractive(InteractiveShell):
# vs is the list of variables # vs is the list of variables
# you can print it out, the left-side is the variable name, # you can print it out, the left-side is the variable name,
# the right side wraps a handle to a variable # the right side wraps a handle to a variable
# pdb.set_trace() pdb.set_trace()
# #pdb.set_trace() # import pdb; pdb.set_trace()
# atom match either symbols, or if no symbol exists, strings, In this case # atom match either symbols, or if no symbol ex b pl nvists, strings, In this case
# variable names should match strings # variable names should match strings
# ask = True # ask = True
# launch the query # launch the query
@ -222,6 +224,7 @@ class YAPInteractive(InteractiveShell):
store_history = False store_history = False
if store_history: if store_history:
self.execution_count = self.execution_count+1
result.execution_count = self.execution_count result.execution_count = self.execution_count
def error_before_exec(value): def error_before_exec(value):
@ -237,13 +240,14 @@ class YAPInteractive(InteractiveShell):
# prefilter_manager) raises an exception, we store it in this variable # prefilter_manager) raises an exception, we store it in this variable
# so that we can display the error after logging the input and storing # so that we can display the error after logging the input and storing
# it in the history. # it in the history.
# preprocessing_exc_tuple = None preprocessing_exc_tuple = None
# try: try:
# # Static input transformations # Static input transformations
# cell = raw_cell #self.input_transformer_manager.transform_cell(raw_cell) cell = raw_cell.strip(" \n\t").rstrip(" \n\t") #self.input_transformer_manager.transform_cell(raw_cell.strip(" \n\t").rstrip(" \n\t"))
# except SyntaxError: except SyntaxError:
# preprocessing_exc_tuple = sys.exc_info() preprocessing_exc_tuple = sys.exc_info()
cell = raw_cell # cell has to exist so it can be stored/logged #
# cell = raw_cell # cell has to exist so it can be stored/logged
# else: # else:
# # import pdb; pdb.set_trace() # # import pdb; pdb.set_trace()
# if False and len(cell.splitlines()) == 1: # if False and len(cell.splitlines()) == 1:
@ -277,6 +281,8 @@ class YAPInteractive(InteractiveShell):
# compiler # compiler
# compiler = self.compile if shell_futures else CachingCompiler() # compiler = self.compile if shell_futures else CachingCompiler()
pdb.set_trace()
cell_name = str( self.execution_count) cell_name = str( self.execution_count)
if cell[0] == '%': if cell[0] == '%':
@ -308,7 +314,7 @@ class YAPInteractive(InteractiveShell):
has_raised = False has_raised = False
try: try:
self.bindings = dict = {} self.bindings = dict = {}
state = self.jupyter_query(cell) state = self.jupyter_query(raw_cell)
if state: if state:
self.last_execution_succeeded = True self.last_execution_succeeded = True
result.result = (True, dict) result.result = (True, dict)
@ -351,31 +357,46 @@ class YAPInteractive(InteractiveShell):
If the line terminates on a `*/` or starts on a `%` we assume the line If the line terminates on a `*/` or starts on a `%` we assume the line
is a comment. is a comment.
""" """
s = s.rstrip() s = s.rstrip().strip()
take = 0 l = s.split("\n")
its = 0 while not l[0]:
[program,x,query] = s.partition('\n') l = l[1:]
if query == '': rl = []
query = program for h in l:
while take < len(query): if h and h[0] == '%':
take += 1 if h[1] == '%':
ch = query[-take] break
if ch.isdigit():
its = its + ord(ch) - ord('0')
elif ch == '*' and take == 1:
return program, query[:-take], -1
elif ch == '.' and take == 1:
return s, '', 1
elif ch == '/' and query[-2] == '*' and take == 1:
return program, query[:-take], -1
elif ch == '^' and take == 1:
return program, query[:-take], 1
elif ch == '?':
return program, query[:-take], its+1
else: else:
return program, query, 1 rl = [h] + rl
if not rl:
return '','',1
query = rl[0]
program = ''
i=0
for h in rl:
if h and not h.isspace():
break
i += 1
rl = rl[i:]
if not rl:
return '','',1
take = 1
ch = query[-take]
if ch == '*' and take == 1:
query = l[:-1]
sols = -1
if ch == '.':
return s, '', 1 return s, '', 1
rl = rl[1:]
while True:
h = rl[0]
if h and not h.isspace():
query = h + '\n'+ query
rl = rl[1:]
break
for l in rl:
program = l + '\n'+ program
return program,query,take
def jupyter_query(self, s): def jupyter_query(self, s):
# import pdb; pdb.set_trace() # import pdb; pdb.set_trace()
@ -383,14 +404,18 @@ class YAPInteractive(InteractiveShell):
# construct a self.query from a one-line string # construct a self.query from a one-line string
# self.q is opaque to Python # self.q is opaque to Python
self.bindings = {} self.bindings = {}
self.port = "call" iterations=1
if self.q and s != self.os: if self.q and s != self.os:
self.q.close() self.q.close()
self.q = None self.q = None
if not self.q: if not self.q:
import pdb; pdb.set_trace() #import pdb; pdb.set_trace()
program,query,self.iterations = self.prolog_cell(s) self.port = "call"
program,query,iterations = self.prolog_cell(s)
self.q = self.yapeng.query(jupyter_query(self, program, query)) self.q = self.yapeng.query(jupyter_query(self, program, query))
self.solutions = []
if not self.q:
return True, []
self.os = s self.os = s
# vs is the list of variables # vs is the list of variables
# you can print it out, the left-side is the variable name, # you can print it out, the left-side is the variable name,
@ -406,23 +431,34 @@ class YAPInteractive(InteractiveShell):
# ask = True # ask = True
# launch the query # launch the query
# run the new commbnand using the given tracer # run the new commbnand using the given tracer
solutions = [] if iterations <0:
while self.iterations > 0: while self.answer( self.q):
self.iterations -= 1 self.solutions += [self.bindings]
self.q.close()
self.q = None
self.os = ""
if not self.solutions:
print("no solutions found")
return True
rc = self.answer(self.q) rc = self.answer(self.q)
if rc: if rc:
# deterministic = one solution # deterministic = one solution
#Dict = {}
#engine.goal(show_answer( q.namedVars(), Dict))
self.solutions += [self.bindings]
if self.port == "exit": if self.port == "exit":
# done # done
self.q.close() self.q.close()
self.q = None self.q = None
self.os = "" self.os = ""
print("yes") return True
solutions += [self.bindings] else:
print("No (more) answers") print("No (more) answers")
self.q.close() self.q.close()
self.q = None self.q = None
return True, solutions self.os = ''
return False
def answer(self, q): def answer(self, q):
try: try:
@ -430,7 +466,7 @@ class YAPInteractive(InteractiveShell):
except Exception as e: except Exception as e:
print(e.args[1]) print(e.args[1])
self.yapeng.goal(exit_cell(self)) self.yapeng.goal(exit_cell(self))
return False, None return e
class YAPInteractiveABC(metaclass=abc.ABCMeta): class YAPInteractiveABC(metaclass=abc.ABCMeta):

51
packages/python/yap_kernel/yap_ipython/prolog/jupyter.yap
View File

@ -1,4 +1,14 @@
/**
* @file jupyter.yap
*
* @brief allow interaction between Jupyter and YAP.
*
* @long The code in here:
* - establishes communication between Prolog and Python Streams
* - inputs Prolog code and queries
* - supports completion of Prolog programs.
* -
*/
:- use_module(library(yapi)). :- use_module(library(yapi)).
:- use_module(library(lists)). :- use_module(library(lists)).
:- use_module(library(maplist)). :- use_module(library(maplist)).
@ -6,33 +16,50 @@
:- python_import(sys). :- python_import(sys).
:- start_low_level_trace.
user:jupyter_query(Self, Cell, Line ) :- user:jupyter_query(Self, Cell, Line ) :-
setup_call_cleanup( setup_call_cleanup(
enter_cell(Self), enter_cell(Self),
jupyter_cell(Self, Cell, Line), jupyter_cell(Self, Cell, Line),
exit_cell(Self) ). exit_cell(Self)
).
jupyter_cell(_Self, Cell, _) :- jupyter_cell(_Self, Cell, _) :-
open_mem_read_stream( Cell, Stream), stop_low_level_trace,
load_files(['jupyter cell'],[stream(Stream)]), jupyter_consult(Cell),
close( Stream ),
fail. fail.
jupyter_cell( _Self, _, Line ) :-
blank( Line ),
!.
jupyter_cell( Self, _, Line ) :- jupyter_cell( Self, _, Line ) :-
start_low_level_trace,
python_query( Self, Line ). python_query( Self, Line ).
jupyter_consult(Text) :-
blank( Text ),
!.
jupyter_consult(Cell) :-
open_mem_read_stream( Cell, Stream),
load_files(user:'jupyter cell',[stream(Stream)]).
%should load_files close?
blank(Text) :-
atom_codes(Text, L),
maplist( blankc, L).
blankc(' ').
blankc('\n').
blankc('\t').
enter_cell(_Self) :- enter_cell(_Self) :-
%open('//python/sys.stdin', read, _Input, []),
open('//python/sys.stdout', append, _Output, []), open('//python/sys.stdout', append, _Output, []),
open('//python/sys.stdout', append, _Error, []), open('//python/sys.stdout', append, _Error, []),
%set_prolog_flag(user_input, _Input),
set_prolog_flag(user_output, _Output), set_prolog_flag(user_output, _Output),
set_prolog_flag(user_error, _Error), set_prolog_flag(user_error, _Error).
writeln(hello),
format(user_error,'h~n',[]),
:= print("py"),
:= sys.stderr.write("ok\n").
exit_cell(_Self) :- exit_cell(_Self) :-
%close( user_input),
close( user_output), close( user_output),
close( user_error). close( user_error).

36
pl/consult.yap
View File

@ -244,10 +244,11 @@ load_files(Files,Opts) :-
'$lf_option'('$parent_topts', 28, _). '$lf_option'('$parent_topts', 28, _).
'$lf_option'(must_be_module, 29, false). '$lf_option'(must_be_module, 29, false).
'$lf_option'('$source_pos', 30, _). '$lf_option'('$source_pos', 30, _).
'$lf_option'(initialization, 31, Ref) :- '$lf_option'('$from_stream', 31, false).
'$lf_option'(initialization, 32, Ref) :-
nb:nb_queue(Ref). nb:nb_queue(Ref).
'$lf_option'(last_opt, 31). '$lf_option'(last_opt, 32).
'$lf_opt'( Op, TOpts, Val) :- '$lf_opt'( Op, TOpts, Val) :-
'$lf_option'(Op, Id, _), '$lf_option'(Op, Id, _),
@ -265,7 +266,6 @@ load_files(Files,Opts) :-
functor( OldTOpts, opt, LastOpt ), functor( OldTOpts, opt, LastOpt ),
'$lf_opt'('$context_module', OldTOpts, user) '$lf_opt'('$context_module', OldTOpts, user)
), ),
'$check_files'(Files,load_files(Files,Opts)),
'$lf_option'(last_opt, LastOpt), '$lf_option'(last_opt, LastOpt),
functor( TOpts, opt, LastOpt ), functor( TOpts, opt, LastOpt ),
( source_location(ParentF, Line) -> true ; ParentF = user_input, Line = -1 ), ( source_location(ParentF, Line) -> true ; ParentF = user_input, Line = -1 ),
@ -276,6 +276,12 @@ load_files(Files,Opts) :-
'$lf_opt'('$parent_topts', TOpts, OldTOpts), '$lf_opt'('$parent_topts', TOpts, OldTOpts),
'$process_lf_opts'(Opts,TOpts,Files,Call), '$process_lf_opts'(Opts,TOpts,Files,Call),
'$lf_default_opts'(1, LastOpt, TOpts), '$lf_default_opts'(1, LastOpt, TOpts),
'$lf_opt'(stream, TOpts, Stream),
( nonvar(Stream) ->
'$set_lf_opt'('$from_stream', TOpts, true )
;
'$check_files'(Files,load_files(Files,Opts))
),
'$check_use_module'(Call,UseModule), '$check_use_module'(Call,UseModule),
'$lf_opt'('$use_module', TOpts, UseModule), '$lf_opt'('$use_module', TOpts, UseModule),
'$current_module'(M0), '$current_module'(M0),
@ -432,7 +438,7 @@ load_files(Files,Opts) :-
'$lf'(File, Mod, Call, TOpts) :- '$lf'(File, Mod, Call, TOpts) :-
'$lf_opt'(stream, TOpts, Stream), '$lf_opt'(stream, TOpts, Stream),
b_setval('$user_source_file', File), b_setval('$user_source_file', File),
( var(Stream) -> ( '$lf_opt'('$from_stream', TOpts, false ) ->
/* need_to_open_file */ /* need_to_open_file */
( '$full_filename'(File, Y) -> true ; '$do_error'(existence_error(source_sink,File),Call) ), ( '$full_filename'(File, Y) -> true ; '$do_error'(existence_error(source_sink,File),Call) ),
( open(Y, read, Stream) -> true ; '$do_error'(permission_error(input,stream,Y),Call) ) ( open(Y, read, Stream) -> true ; '$do_error'(permission_error(input,stream,Y),Call) )
@ -448,18 +454,22 @@ load_files(Files,Opts) :-
'$start_lf'(If, Mod, Stream, TOpts, File, Y, Reexport, Imports), '$start_lf'(If, Mod, Stream, TOpts, File, Y, Reexport, Imports),
close(Stream). close(Stream).
% consulting from a stre
'$start_lf'(_not_loaded, Mod, Stream, TOpts, UserFile, File, _Reexport, _Imports) :-
'$lf_opt'('$from_stream', TOpts, true ),
!,
'$do_lf'(Mod, Stream, UserFile, File, TOpts).
'$start_lf'(not_loaded, Mod, _Stream, TOpts, UserFile, File, Reexport,Imports) :- '$start_lf'(not_loaded, Mod, _Stream, TOpts, UserFile, File, Reexport,Imports) :-
'$file_loaded'(File, Mod, Imports, TOpts), !, '$file_loaded'(File, Mod, Imports, TOpts), !,
'$lf_opt'('$options', TOpts, Opts), '$lf_opt'('$options', TOpts, Opts),
'$lf_opt'('$location', TOpts, ParentF:Line), '$lf_opt'('$location', TOpts, ParentF:Line),
'$loaded'(File, UserFile, Mod, ParentF, Line, not_loaded, _, _Dir, Opts), '$loaded'(File, UserFile, Mod, ParentF, Line, not_loaded, _, _Dir, TOpts, Opts),
'$reexport'( TOpts, ParentF, Reexport, Imports, File ). '$reexport'( TOpts, ParentF, Reexport, Imports, File ).
'$start_lf'(changed, Mod, _Stream, TOpts, UserFile, File, Reexport, Imports) :- '$start_lf'(changed, Mod, _Stream, TOpts, UserFile, File, Reexport, Imports) :-
'$file_unchanged'(File, Mod, Imports, TOpts), !, '$file_unchanged'(File, Mod, Imports, TOpts), !,
'$lf_opt'('$options', TOpts, Opts), '$lf_opt'('$options', TOpts, Opts),
'$lf_opt'('$location', TOpts, ParentF:Line), '$lf_opt'('$location', TOpts, ParentF:Line),
'$loaded'(File, UserFile, Mod, ParentF, Line, changed, _, _Dir, Opts), '$loaded'(File, UserFile, Mod, ParentF, Line, changed, _, _Dir, TOpts, Opts),
'$reexport'( TOpts, ParentF, Reexport, Imports, File ). '$reexport'( TOpts, ParentF, Reexport, Imports, File ).
'$start_lf'(_, Mod, PlStream, TOpts, _UserFile, File, Reexport, ImportList) :- '$start_lf'(_, Mod, PlStream, TOpts, _UserFile, File, Reexport, ImportList) :-
% check if there is a qly file % check if there is a qly file
@ -677,7 +687,7 @@ db_files(Fs) :-
'$lf_opt'(consult, TOpts, Reconsult0), '$lf_opt'(consult, TOpts, Reconsult0),
'$lf_opt'('$options', TOpts, Opts), '$lf_opt'('$options', TOpts, Opts),
'$lf_opt'('$location', TOpts, ParentF:Line), '$lf_opt'('$location', TOpts, ParentF:Line),
'$loaded'(File, UserFile, SourceModule, ParentF, Line, Reconsult0, Reconsult, Dir, Opts), '$loaded'(File, UserFile, SourceModule, ParentF, Line, Reconsult0, Reconsult, Dir, TOpts, Opts),
working_directory(OldD, Dir), working_directory(OldD, Dir),
H0 is heapused, '$cputime'(T0,_), H0 is heapused, '$cputime'(T0,_),
current_prolog_flag(generate_debug_info, GenerateDebug), current_prolog_flag(generate_debug_info, GenerateDebug),
@ -740,6 +750,7 @@ db_files(Fs) :-
'$q_do_save_file'(File, UserF, TOpts ) :- '$q_do_save_file'(File, UserF, TOpts ) :-
'$lf_opt'(qcompile, TOpts, QComp), '$lf_opt'(qcompile, TOpts, QComp),
'$lf_opt'('$source_pos', TOpts, Pos), '$lf_opt'('$source_pos', TOpts, Pos),
'$lf_opt'('$from_stream', TOpts, false),
( QComp == auto ; QComp == large, Pos > 100*1024), ( QComp == auto ; QComp == large, Pos > 100*1024),
'$absolute_file_name'(UserF,[file_type(qly),solutions(first),expand(true)],F), '$absolute_file_name'(UserF,[file_type(qly),solutions(first),expand(true)],F),
!, !,
@ -844,7 +855,7 @@ nb_setval('$if_le1vel',0).
working_directory(Dir0, Dir), working_directory(Dir0, Dir),
'$lf_opt'(encoding, TOpts, Encoding), '$lf_opt'(encoding, TOpts, Encoding),
set_stream(Stream, [encoding(Encoding),alias(loop_stream)] ), set_stream(Stream, [encoding(Encoding),alias(loop_stream)] ),
'$loaded'(Y, X, Mod, _OldY, _L, include, _, Dir, []), '$loaded'(Y, X, Mod, _OldY, _L, include, _, Dir, TOpts,[]),
( nb:'$nb_getval'('$included_file', OY, fail ) -> true ; OY = [] ), ( nb:'$nb_getval'('$included_file', OY, fail ) -> true ; OY = [] ),
nb_setval('$included_file', Y), nb_setval('$included_file', Y),
print_message(informational, loading(including, Y)), print_message(informational, loading(including, Y)),
@ -1012,10 +1023,9 @@ prolog_load_context(stream, Stream) :-
time_file64(F,CurrentAge), time_file64(F,CurrentAge),
( (Age == CurrentAge ; Age = -1) -> true; erase(R), fail). ( (Age == CurrentAge ; Age = -1) -> true; erase(R), fail).
% inform the file has been loaded and is now available. % inform the file has been loaded and is now available.
'$loaded'(F, UserFile, M, OldF, Line, Reconsult0, Reconsult, Dir, Opts) :- '$loaded'(F, UserFile, M, OldF, Line, Reconsult0, Reconsult, Dir, TOpts, Opts) :-
( F == user_input -> working_directory(Dir,Dir) ; file_directory_name(F, Dir) ), ( '$lf_opt'('$from_stream',TOpts,true) -> working_directory(Dir,Dir) ; file_directory_name(F, Dir) ),
nb_setval('$consulting_file', F ), nb_setval('$consulting_file', F ),
( (
% if we are reconsulting, always start from scratch % if we are reconsulting, always start from scratch
@ -1044,7 +1054,7 @@ prolog_load_context(stream, Stream) :-
; ;
Reconsult = Reconsult0 Reconsult = Reconsult0
), ),
( F == user_input -> Age = 0 ; time_file64(F, Age) ), ( '$lf_opt'('$from_stream',TOpts,true) -> Age = 0 ; time_file64(F, Age) ),
% modules are logically loaded only once % modules are logically loaded only once
( recorded('$module','$module'(F,_DonorM,_SourceF, _AllExports, _Line),_) -> true ; ( recorded('$module','$module'(F,_DonorM,_SourceF, _AllExports, _Line),_) -> true ;

1
pl/init.yap
View File

@ -348,7 +348,6 @@ If this hook predicate succeeds it must instantiate the _Action_ argument to th
:- dynamic user:exception/3. :- dynamic user:exception/3.
:- reconsult('pathconf.yap'). :- reconsult('pathconf.yap').
/* /*
Add some tests Add some tests