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

locking

Browse Source
This commit is contained in:
Vítor Santos Costa 2018-03-18 00:44:08 +00:00
parent cc6eca6903
commit af610dc16d
12 changed files with 437 additions and 1096 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CXX/yapi.cpp
View File

@ -440,10 +440,7 @@ bool YAPEngine::call(YAPPredicate ap, YAPTerm ts[]) {
//q.e = new YAPError(); //q.e = new YAPError();
} }
// don't forget, on success these bindings will still be there); // don't forget, on success these bindings will still be there);
PyThreadState *tstate;
Py_BEGIN_ALLOW_THREADS
result = YAP_LeaveGoal(false, &q); result = YAP_LeaveGoal(false, &q);
Py_END_ALLOW_THREADS
Yap_CloseHandles(q.CurSlot); Yap_CloseHandles(q.CurSlot);
LOCAL_RestartEnv = oj; LOCAL_RestartEnv = oj;
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
@ -462,7 +459,7 @@ bool YAPEngine::mgoal(Term t, Term tmod) {
sigjmp_buf buf, *oldp = LOCAL_RestartEnv; sigjmp_buf buf, *oldp = LOCAL_RestartEnv;
PyThreadState *_save; PyThreadState *_save;
_save = PyEval_SaveThread(); // _save = PyEval_SaveThread();
try { try {
CACHE_REGS CACHE_REGS
BACKUP_MACHINE_REGS(); BACKUP_MACHINE_REGS();
@ -489,7 +486,7 @@ bool YAPEngine::mgoal(Term t, Term tmod) {
// allow Prolog style exception handling // allow Prolog style exception handling
LOCAL_RestartEnv = &buf; LOCAL_RestartEnv = &buf;
if (sigsetjmp(*LOCAL_RestartEnv, false)) { if (sigsetjmp(*LOCAL_RestartEnv, false)) {
PyEval_RestoreThread(_save); // PyEval_RestoreThread(_save);
std::cerr << "Restart\n"; std::cerr << "Restart\n";
//throw new YAPError(); //throw new YAPError();
} }
@ -498,7 +495,7 @@ bool YAPEngine::mgoal(Term t, Term tmod) {
result = (bool)YAP_EnterGoal(ap, nullptr, &q); result = (bool)YAP_EnterGoal(ap, nullptr, &q);
{ {
YAP_LeaveGoal(false, &q); YAP_LeaveGoal(false, &q);
PyEval_RestoreThread(_save); // PyEval_RestoreThread(_save);
LOCAL_RestartEnv = oldp; LOCAL_RestartEnv = oldp;
RECOVER_MACHINE_REGS(); RECOVER_MACHINE_REGS();
return result; return result;
@ -506,7 +503,7 @@ bool YAPEngine::mgoal(Term t, Term tmod) {
} catch (YAPError e) { } catch (YAPError e) {
YAP_LeaveGoal(false, &q); YAP_LeaveGoal(false, &q);
Yap_CloseHandles(q.CurSlot); Yap_CloseHandles(q.CurSlot);
PyEval_RestoreThread(_save); // PyEval_RestoreThread(_save);
LOCAL_RestartEnv = oldp; LOCAL_RestartEnv = oldp;
return 0; return 0;
//throw e; //throw e;

2
os/fmem.c
View File

@ -152,7 +152,7 @@ int Yap_open_buf_read_stream(const char *buf, size_t nchars, encoding_t *encp,
// like any file stream. // like any file stream.
f = st->file = fmemopen((void *)buf, nchars, "r"); f = st->file = fmemopen((void *)buf, nchars, "r");
flags = Input_Stream_f | InMemory_Stream_f | Seekable_Stream_f; flags = Input_Stream_f | InMemory_Stream_f | Seekable_Stream_f;
Yap_initStream(sno, f, "memStream", "r", buf, encoding, flags, NULL); Yap_initStream(sno, f, "memStream", "r", TermNone, encoding, flags, NULL);
// like any file stream. // like any file stream.
Yap_DefaultStreamOps(st); Yap_DefaultStreamOps(st);
UNLOCK(st->streamlock); UNLOCK(st->streamlock);

2
os/mem.c
View File

@ -228,7 +228,7 @@ int Yap_open_buf_read_stream(const char *buf, size_t nchars, encoding_t *encp,
st->file = f = NULL; st->file = f = NULL;
flags = Input_Stream_f | InMemory_Stream_f; flags = Input_Stream_f | InMemory_Stream_f;
st->vfs = NULL; st->vfs = NULL;
Yap_initStream(sno, f, ""wa", TermNil, encoding, flags, AtomRead, NULL); Yap_initStream(sno, f, "wa", TermNil, encoding, flags, AtomRead, NULL);
// like any file stream. // like any file stream.
/* currently these streams are not seekable */ /* currently these streams are not seekable */
st->status = Input_Stream_f | InMemory_Stream_f; st->status = Input_Stream_f | InMemory_Stream_f;

2
packages/python/py2pl.c
View File

@ -215,7 +215,7 @@ X_API YAP_Term pythonToYAP(PyObject *pVal) {
} }
YAP_Term tt = YAP_GetFromSlot(t); YAP_Term tt = YAP_GetFromSlot(t);
PL_reset_term_refs(t); PL_reset_term_refs(t);
Py_DECREF(pVal); //Py_DECREF(pVal);
return tt; return tt;
} }

17
packages/python/pyio.c
View File

@ -51,15 +51,17 @@ VFS_t pystream;
if (strstr(name, "/python/") == name) if (strstr(name, "/python/") == name)
name += strlen("/python/"); name += strlen("/python/");
#endif #endif
term_t ctk = python_acquire_GIL();
PyObject *pystream = string_to_python(name, true, NULL); PyObject *pystream = string_to_python(name, true, NULL);
if (pystream == NULL || pystream == Py_None) { if (pystream == NULL || pystream == Py_None) {
python_release_GIL(ctk);
return NULL; return NULL;
} }
StreamDesc *st = YAP_RepStreamFromId(sno); StreamDesc *st = YAP_RepStreamFromId(sno);
st->name = YAP_LookupAtom(name); st->name = YAP_LookupAtom(name);
if (0&&strcmp(name,"sys.stdout") == 0) { if (strcmp(name,"sys.stdout") == 0) {
st->user_name = TermOutStream; st->user_name = TermOutStream;
} else if(0&&strcmp(name,"sys.stderr") == 0) { } else if(strcmp(name,"sys.stderr") == 0) {
st->user_name = TermErrStream; st->user_name = TermErrStream;
} else { } else {
st->user_name = YAP_MkAtomTerm(st->name); st->user_name = YAP_MkAtomTerm(st->name);
@ -67,12 +69,19 @@ VFS_t pystream;
// we assume object is already open, so there is no need to open it. // we assume object is already open, so there is no need to open it.
st->u.private_data = pystream; st->u.private_data = pystream;
st->vfs = me; st->vfs = me;
python_release_GIL(ctk);
return st; return st;
} }
static bool py_close(int sno) { static bool py_close(int sno) {
StreamDesc *st = YAP_RepStreamFromId(sno); StreamDesc *st = YAP_RepStreamFromId(sno);
if (strcmp(st->name,"sys.stdout") &&
strcmp(st->name,"sys.stderr")) {
Py_XDECREF(st->u.private_data); Py_XDECREF(st->u.private_data);
}
st->u.private_data = NULL;
st->vfs = NULL;
return true; return true;
} }
@ -142,7 +151,7 @@ static int py_peek(int sno) {
static int64_t py_seek(int sno, int64_t where, int how) { static int64_t py_seek(int sno, int64_t where, int how) {
StreamDesc *g0 = YAP_RepStreamFromId(sno); StreamDesc *g0 = YAP_RepStreamFromId(sno);
PyGILState_STATE s0 = python_acquire_GIL(); term_t s0 = python_acquire_GIL();
PyObject *fseek = PyObject_GetAttrString(g0->u.private_data, "seek"); PyObject *fseek = PyObject_GetAttrString(g0->u.private_data, "seek");
PyObject *pyr = PyObject_CallFunctionObjArgs(fseek, PyLong_FromLong(where), PyObject *pyr = PyObject_CallFunctionObjArgs(fseek, PyLong_FromLong(where),
PyLong_FromLong(how), NULL); PyLong_FromLong(how), NULL);
@ -152,7 +161,7 @@ return PyLong_AsLong(pyr);
static void py_flush(int sno) { static void py_flush(int sno) {
StreamDesc *s = YAP_GetStreamFromId(sno); StreamDesc *s = YAP_GetStreamFromId(sno);
PyGILState_STATE tg = python_acquire_GIL(); term_t tg = python_acquire_GIL();
PyObject *flush = PyObject_GetAttrString(s->u.private_data, "flush"); PyObject *flush = PyObject_GetAttrString(s->u.private_data, "flush");
PyObject_CallFunction(flush, NULL); PyObject_CallFunction(flush, NULL);
python_release_GIL(tg); python_release_GIL(tg);

701
packages/python/pypreds.c
View File

File diff suppressed because one or more lines are too long

1
packages/python/swig/MANIFEST.in
View File

@ -1,5 +1,6 @@
# include CONTRIBUTING.md # include CONTRIBUTING.md
include README.md include README.md
include *.py
recursive-include yap4py/prolog *.* recursive-include yap4py/prolog *.*
recursive-include html *.* recursive-include html *.*

2
packages/python/swig/yap4py/__init__.py.in
View File

@ -30,4 +30,4 @@ else:
dll = glob.glob(os.path.join(os.path.dirname(__file__),dll))[0] dll = glob.glob(os.path.join(os.path.dirname(__file__),dll))[0]
dll = os.path.abspath(dll) dll = os.path.abspath(dll)
ctypes.CDLL(dll) ctypes.CDLL(dll)
load('_yap*.so') #load('_yap*.so')

8
packages/python/swig/yap4py/yapi.py
View File

@ -1,5 +1,5 @@
import readline import readline
from yap4py.yap import YAPEngine, YAPEngineArgs, YAPPredicate, YAPQuery, YAPPrologPredicate, YAPVarTerm from yap4py.yap import *
from os.path import join, dirname from os.path import join, dirname
from collections import namedtuple from collections import namedtuple
import sys import sys
@ -144,7 +144,7 @@ class YAPShell:
# if not isinstance(eq[0],str): # if not isinstance(eq[0],str):
# print( "Error: Variable Name matches a Python Symbol") # print( "Error: Variable Name matches a Python Symbol")
# return # return
do_ask = True self.do_ask = True
engine = self.engine engine = self.engine
bindings = [] bindings = []
g = python_query(self, query) g = python_query(self, query)
@ -152,7 +152,7 @@ class YAPShell:
self.q = Query( engine, g ) self.q = Query( engine, g )
for bind in self.q: for bind in self.q:
bindings += [bind] bindings += [bind]
if do_ask: if self.do_ask:
print(bindings) print(bindings)
bindings = [] bindings = []
s = input("more(;), all(*), no(\\n), python(#) ?").lstrip() s = input("more(;), all(*), no(\\n), python(#) ?").lstrip()
@ -166,7 +166,7 @@ class YAPShell:
except: except:
raise raise
elif s.startswith('*') or s.startswith('a'): elif s.startswith('*') or s.startswith('a'):
do_ask = False self.do_ask = False
continue continue
else: else:
break break

713
packages/python/yap_kernel/CMakeLists.txt
View File

@ -2,362 +2,388 @@
set (PYTHON_SOURCES set (PYTHON_SOURCES
yap_kernel_launcher.py yap_kernel_launcher.py
docs/conf.py docs/conf.py
yap_kernel/serialize.py yap_kernel/codeutil.py
yap_kernel/_eventloop_macos.py yap_kernel/comm
yap_kernel/jsonutil.py
yap_kernel/pickleutil.py
yap_kernel/pylab/backend_inline.py
yap_kernel/pylab/config.py
yap_kernel/pylab/__init__.py
yap_kernel/displayhook.py
yap_kernel/__main__.py
yap_kernel/gui/gtk3embed.py
yap_kernel/gui/gtkembed.py
yap_kernel/gui/__init__.py
yap_kernel/parentpoller.py
yap_kernel/_version.py
yap_kernel/eventloops.py
yap_kernel/connect.py yap_kernel/connect.py
yap_kernel/datapub.py
yap_kernel/displayhook.py
yap_kernel/embed.py
yap_kernel/_eventloop_macos.py
yap_kernel/eventloops.py
yap_kernel/gui
yap_kernel/heartbeat.py
yap_kernel/__init__.py
yap_kernel/inprocess
yap_kernel/iostream.py
yap_kernel/ipkernel.py
yap_kernel/jsonutil.py
yap_kernel/kernelapp.py
yap_kernel/kernelbase.py
yap_kernel/kernelspec.py
yap_kernel/log.py
yap_kernel/__main__.py
yap_kernel/parentpoller.py
yap_kernel/pickleutil.py
yap_kernel/pylab
yap_kernel/serialize.py
yap_kernel/tests
yap_kernel/_version.py
yap_kernel/zmqshell.py
yap_ipython/config.py
yap_ipython/consoleapp.py
yap_ipython/core
yap_ipython/display.py
yap_ipython/extensions
yap_ipython/external
yap_ipython/frontend.py
yap_ipython/html.py
yap_ipython/__init__.py
yap_ipython/kernel
yap_ipython/lib
yap_ipython/__main__.py
yap_ipython/nbconvert.py
yap_ipython/nbformat.py
yap_ipython/parallel.py
yap_ipython/paths.py
yap_ipython/prolog
yap_ipython/qt.py
yap_ipython/sphinxext
yap_ipython/terminal
yap_ipython/testing
yap_ipython/utils
yap_ipython/yapi.py
yap_kernel/comm/comm.py yap_kernel/comm/comm.py
yap_kernel/comm/__init__.py yap_kernel/comm/__init__.py
yap_kernel/comm/manager.py yap_kernel/comm/manager.py
yap_kernel/kernelspec.py yap_kernel/gui/gtk3embed.py
yap_kernel/iostream.py yap_kernel/gui/gtkembed.py
yap_kernel/zmqshell.py yap_kernel/gui/__init__.py
yap_kernel/kernelbase.py yap_kernel/inprocess/blocking.py
yap_kernel/heartbeat.py yap_kernel/inprocess/channels.py
yap_kernel/log.py yap_kernel/inprocess/client.py
yap_kernel/datapub.py yap_kernel/inprocess/constants.py
yap_kernel/codeutil.py yap_kernel/inprocess/__init__.py
yap_kernel/kernelapp.py yap_kernel/inprocess/ipkernel.py
yap_kernel/embed.py yap_kernel/inprocess/manager.py
yap_kernel/tests/test_embed_kernel.py yap_kernel/inprocess/socket.py
yap_kernel/tests/test_kernelspec.py yap_kernel/inprocess/tests
yap_kernel/pylab/backend_inline.py
yap_kernel/pylab/config.py
yap_kernel/pylab/__init__.py
yap_kernel/tests/_asyncio.py yap_kernel/tests/_asyncio.py
yap_kernel/tests/test_serialize.py yap_kernel/tests/__init__.py
yap_kernel/tests/test_pickleutil.py yap_kernel/tests/test_connect.py
yap_kernel/tests/test_embed_kernel.py
yap_kernel/tests/test_eventloop.py yap_kernel/tests/test_eventloop.py
yap_kernel/tests/utils.py
yap_kernel/tests/test_kernel.py
yap_kernel/tests/test_io.py yap_kernel/tests/test_io.py
yap_kernel/tests/test_jsonutil.py yap_kernel/tests/test_jsonutil.py
yap_kernel/tests/test_connect.py yap_kernel/tests/test_kernel.py
yap_kernel/tests/test_kernelspec.py
yap_kernel/tests/test_message_spec.py yap_kernel/tests/test_message_spec.py
yap_kernel/tests/__init__.py yap_kernel/tests/test_pickleutil.py
yap_kernel/tests/test_serialize.py
yap_kernel/tests/test_start_kernel.py yap_kernel/tests/test_start_kernel.py
yap_kernel/tests/test_zmq_shell.py yap_kernel/tests/test_zmq_shell.py
yap_kernel/__init__.py yap_kernel/tests/utils.py
yap_kernel/inprocess/blocking.py
yap_kernel/inprocess/socket.py
yap_kernel/inprocess/constants.py
yap_kernel/inprocess/channels.py
yap_kernel/inprocess/tests/test_kernelmanager.py
yap_kernel/inprocess/tests/test_kernel.py
yap_kernel/inprocess/tests/__init__.py
yap_kernel/inprocess/__init__.py
yap_kernel/inprocess/manager.py
yap_kernel/inprocess/client.py
yap_kernel/inprocess/ipkernel.py
yap_kernel/ipkernel.py
yap_ipython/display.py
yap_ipython/frontend.py
yap_ipython/parallel.py
yap_ipython/html.py
yap_ipython/__main__.py
_version.py
yap_ipython/_version.py
yap_ipython/testing/iptest.py
yap_ipython/testing/skipdoctest.py
yap_ipython/testing/tools.py
yap_ipython/testing/iptestcontroller.py
yap_ipython/testing/__main__.py
yap_ipython/testing/decorators.py
yap_ipython/testing/ipunittest.py
yap_ipython/testing/tests/test_tools.py
yap_ipython/testing/tests/test_ipunittest.py
yap_ipython/testing/tests/test_decorators.py
yap_ipython/testing/tests/__init__.py
yap_ipython/testing/__init__.py
yap_ipython/testing/globalipapp.py
yap_ipython/testing/plugin/iptest.py
yap_ipython/testing/plugin/show_refs.py
yap_ipython/testing/plugin/simplevars.py
yap_ipython/testing/plugin/simple.py
yap_ipython/testing/plugin/ipdoctest.py
yap_ipython/testing/plugin/test_ipdoctest.py
yap_ipython/testing/plugin/setup.py
yap_ipython/testing/plugin/__init__.py
yap_ipython/testing/plugin/dtexample.py
yap_ipython/testing/plugin/test_refs.py
yap_ipython/terminal/ptutils.py
yap_ipython/terminal/shortcuts.py
yap_ipython/terminal/ipapp.py
yap_ipython/terminal/pt_inputhooks/wx.py
yap_ipython/terminal/pt_inputhooks/pyglet.py
yap_ipython/terminal/pt_inputhooks/osx.py
yap_ipython/terminal/pt_inputhooks/gtk.py
yap_ipython/terminal/pt_inputhooks/tk.py
yap_ipython/terminal/pt_inputhooks/glut.py
yap_ipython/terminal/pt_inputhooks/gtk3.py
yap_ipython/terminal/pt_inputhooks/__init__.py
yap_ipython/terminal/pt_inputhooks/qt.py
yap_ipython/terminal/console.py
yap_ipython/terminal/prompts.py
yap_ipython/terminal/ptshell.py
yap_ipython/terminal/embed.py
yap_ipython/terminal/tests/test_help.py
yap_ipython/terminal/tests/test_embed.py
yap_ipython/terminal/tests/test_interactivshell.py
yap_ipython/terminal/tests/__init__.py
yap_ipython/terminal/__init__.py
yap_ipython/terminal/interactiveshell.py
yap_ipython/terminal/debugger.py
yap_ipython/terminal/magics.py
yap_ipython/consoleapp.py
yap_ipython/core/display.py
yap_ipython/core/application.py
yap_ipython/core/builtin_trap.py
yap_ipython/core/formatters.py
yap_ipython/core/prefilter.py
yap_ipython/core/getipython.py
yap_ipython/core/usage.py
yap_ipython/core/oinspect.py
yap_ipython/core/displayhook.py
yap_ipython/core/hooks.py
yap_ipython/core/splitinput.py
yap_ipython/core/page.py
yap_ipython/core/history.py
yap_ipython/core/displaypub.py
yap_ipython/core/profiledir.py
yap_ipython/core/shellapp.py
yap_ipython/core/extensions.py
yap_ipython/core/compilerop.py
yap_ipython/core/events.py
yap_ipython/core/pylabtools.py
yap_ipython/core/completer.py
yap_ipython/core/prompts.py
yap_ipython/core/latex_symbols.py
yap_ipython/core/macro.py
yap_ipython/core/inputsplitter.py
yap_ipython/core/error.py
yap_ipython/core/profileapp.py
yap_ipython/core/magic_arguments.py
yap_ipython/core/logger.py
yap_ipython/core/inputtransformer.py
yap_ipython/core/payloadpage.py
yap_ipython/core/crashhandler.py
yap_ipython/core/magics/display.py
yap_ipython/core/magics/execution.py
yap_ipython/core/magics/namespace.py
yap_ipython/core/magics/basic.py
yap_ipython/core/magics/extension.py
yap_ipython/core/magics/history.py
yap_ipython/core/magics/pylab.py
yap_ipython/core/magics/config.py
yap_ipython/core/magics/osm.py
yap_ipython/core/magics/script.py
yap_ipython/core/magics/__init__.py
yap_ipython/core/magics/auto.py
yap_ipython/core/magics/logging.py
yap_ipython/core/magics/code.py
yap_ipython/core/ultratb.py
yap_ipython/core/tests/test_application.py
yap_ipython/core/tests/simpleerr.py
yap_ipython/core/tests/test_paths.py
yap_ipython/core/tests/bad_all.py
yap_ipython/core/tests/test_prefilter.py
yap_ipython/core/tests/test_logger.py
yap_ipython/core/tests/test_interactiveshell.py
yap_ipython/core/tests/test_events.py
yap_ipython/core/tests/test_display.py
yap_ipython/core/tests/test_autocall.py
yap_ipython/core/tests/test_formatters.py
yap_ipython/core/tests/test_alias.py
yap_ipython/core/tests/nonascii.py
yap_ipython/core/tests/test_displayhook.py
yap_ipython/core/tests/test_profile.py
yap_ipython/core/tests/test_imports.py
yap_ipython/core/tests/test_oinspect.py
yap_ipython/core/tests/test_inputtransformer.py
yap_ipython/core/tests/test_magic_arguments.py
yap_ipython/core/tests/test_debugger.py
yap_ipython/core/tests/test_hooks.py
yap_ipython/core/tests/test_run.py
yap_ipython/core/tests/test_pylabtools.py
yap_ipython/core/tests/print_argv.py
yap_ipython/core/tests/test_page.py
yap_ipython/core/tests/test_compilerop.py
yap_ipython/core/tests/test_prompts.py
yap_ipython/core/tests/test_magic_terminal.py
yap_ipython/core/tests/__init__.py
yap_ipython/core/tests/test_ultratb.py
yap_ipython/core/tests/test_magic.py
yap_ipython/core/tests/test_iplib.py
yap_ipython/core/tests/test_completer.py
yap_ipython/core/tests/test_shellapp.py
yap_ipython/core/tests/daft_extension/daft_extension.py
yap_ipython/core/tests/refbug.py
yap_ipython/core/tests/tclass.py
yap_ipython/core/tests/test_extension.py
yap_ipython/core/tests/test_splitinput.py
yap_ipython/core/tests/test_completerlib.py
yap_ipython/core/tests/nonascii2.py
yap_ipython/core/tests/test_inputsplitter.py
yap_ipython/core/tests/test_handlers.py
yap_ipython/core/tests/test_history.py
yap_ipython/core/__init__.py
yap_ipython/core/autocall.py
yap_ipython/core/alias.py yap_ipython/core/alias.py
yap_ipython/core/application.py
yap_ipython/core/autocall.py
yap_ipython/core/builtin_trap.py
yap_ipython/core/compilerop.py
yap_ipython/core/completerlib.py yap_ipython/core/completerlib.py
yap_ipython/core/magic.py yap_ipython/core/completer.py
yap_ipython/core/interactiveshell.py yap_ipython/core/crashhandler.py
yap_ipython/core/excolors.py
yap_ipython/core/release.py
yap_ipython/core/display_trap.py
yap_ipython/core/debugger.py yap_ipython/core/debugger.py
yap_ipython/core/displayhook.py
yap_ipython/core/displaypub.py
yap_ipython/core/display.py
yap_ipython/core/display_trap.py
yap_ipython/core/error.py
yap_ipython/core/events.py
yap_ipython/core/excolors.py
yap_ipython/core/extensions.py
yap_ipython/core/formatters.py
yap_ipython/core/getipython.py
yap_ipython/core/historyapp.py yap_ipython/core/historyapp.py
yap_ipython/core/history.py
yap_ipython/core/hooks.py
yap_ipython/core/__init__.py
yap_ipython/core/inputsplitter.py
yap_ipython/core/inputtransformer.py
yap_ipython/core/interactiveshell.py
yap_ipython/core/latex_symbols.py
yap_ipython/core/logger.py
yap_ipython/core/macro.py
yap_ipython/core/magic_arguments.py
yap_ipython/core/magic.py
yap_ipython/core/magics
yap_ipython/core/oinspect.py
yap_ipython/core/page.py
yap_ipython/core/payloadpage.py
yap_ipython/core/payload.py yap_ipython/core/payload.py
yap_ipython/config.py yap_ipython/core/prefilter.py
yap_ipython/utils/frame.py yap_ipython/core/profileapp.py
yap_ipython/utils/ipstruct.py yap_ipython/core/profiledir.py
yap_ipython/utils/module_paths.py yap_ipython/core/prompts.py
yap_ipython/utils/jsonutil.py yap_ipython/core/pylabtools.py
yap_ipython/utils/PyColorize.py yap_ipython/core/release.py
yap_ipython/utils/pickleutil.py yap_ipython/core/shellapp.py
yap_ipython/utils/eventful.py yap_ipython/core/splitinput.py
yap_ipython/utils/ulinecache.py yap_ipython/core/tests
yap_ipython/utils/generics.py yap_ipython/core/ultratb.py
yap_ipython/utils/version.py yap_ipython/core/usage.py
yap_ipython/utils/tz.py yap_ipython/extensions/autoreload.py
yap_ipython/utils/_process_cli.py
yap_ipython/utils/wildcard.py
yap_ipython/utils/dir2.py
yap_ipython/utils/strdispatch.py
yap_ipython/utils/sysinfo.py
yap_ipython/utils/io.py
yap_ipython/utils/decorators.py
yap_ipython/utils/contexts.py
yap_ipython/utils/data.py
yap_ipython/utils/terminal.py
yap_ipython/utils/syspathcontext.py
yap_ipython/utils/tokenize2.py
yap_ipython/utils/localinterfaces.py
yap_ipython/utils/_process_win32_controller.py
yap_ipython/utils/py3compat.py
yap_ipython/utils/sentinel.py
yap_ipython/utils/colorable.py
yap_ipython/utils/_sysinfo.py
yap_ipython/utils/importstring.py
yap_ipython/utils/tokenutil.py
yap_ipython/utils/traitlets.py
yap_ipython/utils/path.py
yap_ipython/utils/daemonize.py
yap_ipython/utils/log.py
yap_ipython/utils/openpy.py
yap_ipython/utils/tempdir.py
yap_ipython/utils/_process_common.py
yap_ipython/utils/tests/test_openpy.py
yap_ipython/utils/tests/test_path.py
yap_ipython/utils/tests/test_shimmodule.py
yap_ipython/utils/tests/test_sysinfo.py
yap_ipython/utils/tests/test_pycolorize.py
yap_ipython/utils/tests/test_wildcard.py
yap_ipython/utils/tests/test_imports.py
yap_ipython/utils/tests/test_importstring.py
yap_ipython/utils/tests/test_module_paths.py
yap_ipython/utils/tests/test_io.py
yap_ipython/utils/tests/test_text.py
yap_ipython/utils/tests/test_decorators.py
yap_ipython/utils/tests/test_tokenutil.py
yap_ipython/utils/tests/test_process.py
yap_ipython/utils/tests/test_dir2.py
yap_ipython/utils/tests/__init__.py
yap_ipython/utils/tests/test_capture.py
yap_ipython/utils/tests/test_tempdir.py
yap_ipython/utils/encoding.py
yap_ipython/utils/__init__.py
yap_ipython/utils/signatures.py
yap_ipython/utils/_process_win32.py
yap_ipython/utils/coloransi.py
yap_ipython/utils/_process_posix.py
yap_ipython/utils/shimmodule.py
yap_ipython/utils/timing.py
yap_ipython/utils/text.py
yap_ipython/utils/process.py
yap_ipython/utils/capture.py
yap_ipython/paths.py
yap_ipython/nbconvert.py
yap_ipython/external/mathjax.py
yap_ipython/external/qt_for_kernel.py
yap_ipython/external/decorators/_numpy_testing_noseclasses.py
yap_ipython/external/decorators/_decorators.py
yap_ipython/external/decorators/__init__.py
yap_ipython/external/__init__.py
yap_ipython/external/qt_loaders.py
yap_ipython/__init__.py
yap_ipython/sphinxext/ipython_console_highlighting.py
yap_ipython/sphinxext/ipython_directive.py
yap_ipython/sphinxext/custom_doctests.py
yap_ipython/sphinxext/__init__.py
yap_ipython/kernel/adapter.py
yap_ipython/kernel/channelsabc.py
yap_ipython/kernel/__main__.py
yap_ipython/kernel/launcher.py
yap_ipython/kernel/multikernelmanager.py
yap_ipython/kernel/restarter.py
yap_ipython/kernel/managerabc.py
yap_ipython/kernel/threaded.py
yap_ipython/kernel/clientabc.py
yap_ipython/kernel/connect.py
yap_ipython/kernel/kernelspecapp.py
yap_ipython/kernel/kernelspec.py
yap_ipython/kernel/channels.py
yap_ipython/kernel/__init__.py
yap_ipython/kernel/manager.py
yap_ipython/kernel/client.py
yap_ipython/nbformat.py
yap_ipython/extensions/cythonmagic.py yap_ipython/extensions/cythonmagic.py
yap_ipython/extensions/storemagic.py
yap_ipython/extensions/tests/test_autoreload.py
yap_ipython/extensions/tests/test_storemagic.py
yap_ipython/extensions/tests/__init__.py
yap_ipython/extensions/__init__.py yap_ipython/extensions/__init__.py
yap_ipython/extensions/rmagic.py yap_ipython/extensions/rmagic.py
yap_ipython/extensions/storemagic.py
yap_ipython/extensions/sympyprinting.py yap_ipython/extensions/sympyprinting.py
yap_ipython/extensions/autoreload.py yap_ipython/extensions/tests
yap_ipython/yapi.py yap_ipython/external/decorators
yap_ipython/qt.py yap_ipython/external/__init__.py
yap_ipython/lib/display.py yap_ipython/external/mathjax.py
yap_ipython/lib/pretty.py yap_ipython/external/qt_for_kernel.py
yap_ipython/lib/inputhookgtk.py yap_ipython/external/qt_loaders.py
yap_ipython/lib/inputhookwx.py yap_ipython/kernel/adapter.py
yap_ipython/lib/lexers.py yap_ipython/kernel/channelsabc.py
yap_ipython/lib/demo.py yap_ipython/kernel/channels.py
yap_ipython/lib/inputhookgtk3.py yap_ipython/kernel/clientabc.py
yap_ipython/lib/kernel.py yap_ipython/kernel/client.py
yap_ipython/lib/inputhookpyglet.py yap_ipython/kernel/connect.py
yap_ipython/lib/editorhooks.py yap_ipython/kernel/__init__.py
yap_ipython/lib/inputhook.py yap_ipython/kernel/kernelspecapp.py
yap_ipython/kernel/kernelspec.py
yap_ipython/kernel/launcher.py
yap_ipython/kernel/__main__.py
yap_ipython/kernel/managerabc.py
yap_ipython/kernel/manager.py
yap_ipython/kernel/multikernelmanager.py
yap_ipython/kernel/restarter.py
yap_ipython/kernel/threaded.py
yap_ipython/lib/backgroundjobs.py yap_ipython/lib/backgroundjobs.py
yap_ipython/lib/latextools.py
yap_ipython/lib/deepreload.py
yap_ipython/lib/tests/test_editorhooks.py
yap_ipython/lib/tests/test_backgroundjobs.py
yap_ipython/lib/tests/test_display.py
yap_ipython/lib/tests/test_pretty.py
yap_ipython/lib/tests/test_imports.py
yap_ipython/lib/tests/test_clipboard.py
yap_ipython/lib/tests/test_lexers.py
yap_ipython/lib/tests/test_deepreload.py
yap_ipython/lib/tests/test_security.py
yap_ipython/lib/tests/__init__.py
yap_ipython/lib/tests/test_latextools.py
yap_ipython/lib/__init__.py
yap_ipython/lib/guisupport.py
yap_ipython/lib/security.py
yap_ipython/lib/inputhookglut.py
yap_ipython/lib/clipboard.py yap_ipython/lib/clipboard.py
yap_ipython/lib/deepreload.py
yap_ipython/lib/demo.py
yap_ipython/lib/display.py
yap_ipython/lib/editorhooks.py
yap_ipython/lib/guisupport.py
yap_ipython/lib/__init__.py
yap_ipython/lib/inputhookglut.py
yap_ipython/lib/inputhookgtk3.py
yap_ipython/lib/inputhookgtk.py
yap_ipython/lib/inputhook.py
yap_ipython/lib/inputhookpyglet.py
yap_ipython/lib/inputhookqt4.py yap_ipython/lib/inputhookqt4.py
yap_ipython/lib/inputhookwx.py
yap_ipython/lib/kernel.py
yap_ipython/lib/latextools.py
yap_ipython/lib/lexers.py
yap_ipython/lib/pretty.py
yap_ipython/lib/security.py
yap_ipython/lib/tests
yap_ipython/prolog/jupyter.yap
yap_ipython/sphinxext/custom_doctests.py
yap_ipython/sphinxext/__init__.py
yap_ipython/sphinxext/ipython_console_highlighting.py
yap_ipython/sphinxext/ipython_directive.py
yap_ipython/terminal/console.py
yap_ipython/terminal/debugger.py
yap_ipython/terminal/embed.py
yap_ipython/terminal/__init__.py
yap_ipython/terminal/interactiveshell.py
yap_ipython/terminal/ipapp.py
yap_ipython/terminal/magics.py
yap_ipython/terminal/prompts.py
yap_ipython/terminal/pt_inputhooks
yap_ipython/terminal/ptshell.py
yap_ipython/terminal/ptutils.py
yap_ipython/terminal/shortcuts.py
yap_ipython/terminal/tests
yap_ipython/testing/decorators.py
yap_ipython/testing/globalipapp.py
yap_ipython/testing/__init__.py
yap_ipython/testing/iptestcontroller.py
yap_ipython/testing/iptest.py
yap_ipython/testing/ipunittest.py
yap_ipython/testing/__main__.py
yap_ipython/testing/plugin
yap_ipython/testing/skipdoctest.py
yap_ipython/testing/tests
yap_ipython/testing/tools.py
yap_ipython/utils/capture.py
yap_ipython/utils/colorable.py
yap_ipython/utils/coloransi.py
yap_ipython/utils/contexts.py
yap_ipython/utils/daemonize.py
yap_ipython/utils/data.py
yap_ipython/utils/decorators.py
yap_ipython/utils/dir2.py
yap_ipython/utils/encoding.py
yap_ipython/utils/eventful.py
yap_ipython/utils/frame.py
yap_ipython/utils/generics.py
yap_ipython/utils/importstring.py
yap_ipython/utils/__init__.py
yap_ipython/utils/io.py
yap_ipython/utils/ipstruct.py
yap_ipython/utils/jsonutil.py
yap_ipython/utils/localinterfaces.py
yap_ipython/utils/log.py
yap_ipython/utils/module_paths.py
yap_ipython/utils/openpy.py
yap_ipython/utils/path.py
yap_ipython/utils/pickleutil.py
yap_ipython/utils/_process_cli.py
yap_ipython/utils/_process_common.py
yap_ipython/utils/_process_posix.py
yap_ipython/utils/process.py
yap_ipython/utils/_process_win32_controller.py
yap_ipython/utils/_process_win32.py
yap_ipython/utils/py3compat.py
yap_ipython/utils/PyColorize.py
yap_ipython/utils/sentinel.py
yap_ipython/utils/shimmodule.py
yap_ipython/utils/signatures.py
yap_ipython/utils/strdispatch.py
yap_ipython/utils/_sysinfo.py
yap_ipython/utils/sysinfo.py
yap_ipython/utils/syspathcontext.py
yap_ipython/utils/tempdir.py
yap_ipython/utils/terminal.py
yap_ipython/utils/tests
yap_ipython/utils/text.py
yap_ipython/utils/timing.py
yap_ipython/utils/tokenize2.py
yap_ipython/utils/tokenutil.py
yap_ipython/utils/traitlets.py
yap_ipython/utils/tz.py
yap_ipython/utils/ulinecache.py
yap_ipython/utils/version.py
yap_ipython/utils/wildcard.py
yap_kernel/inprocess/tests/__init__.py
yap_kernel/inprocess/tests/test_kernelmanager.py
yap_kernel/inprocess/tests/test_kernel.py
yap_ipython/core/magics/auto.py
yap_ipython/core/magics/basic.py
yap_ipython/core/magics/code.py
yap_ipython/core/magics/config.py
yap_ipython/core/magics/display.py
yap_ipython/core/magics/execution.py
yap_ipython/core/magics/extension.py
yap_ipython/core/magics/history.py
yap_ipython/core/magics/__init__.py
yap_ipython/core/magics/logging.py
yap_ipython/core/magics/namespace.py
yap_ipython/core/magics/osm.py
yap_ipython/core/magics/pylab.py
yap_ipython/core/magics/script.py
yap_ipython/core/tests/bad_all.py
yap_ipython/core/tests/daft_extension
yap_ipython/core/tests/__init__.py
yap_ipython/core/tests/nonascii2.py
yap_ipython/core/tests/nonascii.py
yap_ipython/core/tests/print_argv.py
yap_ipython/core/tests/refbug.py
yap_ipython/core/tests/simpleerr.py
yap_ipython/core/tests/tclass.py
yap_ipython/core/tests/test_alias.py
yap_ipython/core/tests/test_application.py
yap_ipython/core/tests/test_autocall.py
yap_ipython/core/tests/test_compilerop.py
yap_ipython/core/tests/test_completerlib.py
yap_ipython/core/tests/test_completer.py
yap_ipython/core/tests/test_debugger.py
yap_ipython/core/tests/test_displayhook.py
yap_ipython/core/tests/test_display.py
yap_ipython/core/tests/test_events.py
yap_ipython/core/tests/test_extension.py
yap_ipython/core/tests/test_formatters.py
yap_ipython/core/tests/test_handlers.py
yap_ipython/core/tests/test_history.py
yap_ipython/core/tests/test_hooks.py
yap_ipython/core/tests/test_imports.py
yap_ipython/core/tests/test_inputsplitter.py
yap_ipython/core/tests/test_inputtransformer.py
yap_ipython/core/tests/test_interactiveshell.py
yap_ipython/core/tests/test_iplib.py
yap_ipython/core/tests/test_logger.py
yap_ipython/core/tests/test_magic_arguments.py
yap_ipython/core/tests/test_magic.py
yap_ipython/core/tests/test_magic_terminal.py
yap_ipython/core/tests/test_oinspect.py
yap_ipython/core/tests/test_page.py
yap_ipython/core/tests/test_paths.py
yap_ipython/core/tests/test_prefilter.py
yap_ipython/core/tests/test_profile.py
yap_ipython/core/tests/test_prompts.py
yap_ipython/core/tests/test_pylabtools.py
yap_ipython/core/tests/test_run.py
yap_ipython/core/tests/test_shellapp.py
yap_ipython/core/tests/test_splitinput.py
yap_ipython/core/tests/test_ultratb.py
yap_ipython/extensions/tests/__init__.py
yap_ipython/extensions/tests/test_autoreload.py
yap_ipython/extensions/tests/test_storemagic.py
yap_ipython/external/decorators/_decorators.py
yap_ipython/external/decorators/__init__.py
yap_ipython/external/decorators/_numpy_testing_noseclasses.py
yap_ipython/lib/tests/__init__.py
yap_ipython/lib/tests/test_backgroundjobs.py
yap_ipython/lib/tests/test_clipboard.py
yap_ipython/lib/tests/test_deepreload.py
yap_ipython/lib/tests/test_display.py
yap_ipython/lib/tests/test_editorhooks.py
yap_ipython/lib/tests/test_imports.py
yap_ipython/lib/tests/test_latextools.py
yap_ipython/lib/tests/test_lexers.py
yap_ipython/lib/tests/test_pretty.py
yap_ipython/lib/tests/test_security.py
yap_ipython/terminal/pt_inputhooks/glut.py
yap_ipython/terminal/pt_inputhooks/gtk3.py
yap_ipython/terminal/pt_inputhooks/gtk.py
yap_ipython/terminal/pt_inputhooks/__init__.py
yap_ipython/terminal/pt_inputhooks/osx.py
yap_ipython/terminal/pt_inputhooks/pyglet.py
yap_ipython/terminal/pt_inputhooks/qt.py
yap_ipython/terminal/pt_inputhooks/tk.py
yap_ipython/terminal/pt_inputhooks/wx.py
yap_ipython/terminal/tests/__init__.py
yap_ipython/terminal/tests/test_embed.py
yap_ipython/terminal/tests/test_help.py
yap_ipython/terminal/tests/test_interactivshell.py
yap_ipython/testing/plugin/dtexample.py
yap_ipython/testing/plugin/__init__.py
yap_ipython/testing/plugin/ipdoctest.py
yap_ipython/testing/plugin/iptest.py
yap_ipython/testing/plugin/setup.py
yap_ipython/testing/plugin/show_refs.py
yap_ipython/testing/plugin/simple.py
yap_ipython/testing/plugin/simplevars.py
yap_ipython/testing/plugin/test_ipdoctest.py
yap_ipython/testing/plugin/test_refs.py
yap_ipython/testing/tests/__init__.py
yap_ipython/testing/tests/test_decorators.py
yap_ipython/testing/tests/test_ipunittest.py
yap_ipython/testing/tests/test_tools.py
yap_ipython/utils/tests/__init__.py
yap_ipython/utils/tests/test_capture.py
yap_ipython/utils/tests/test_decorators.py
yap_ipython/utils/tests/test_dir2.py
yap_ipython/utils/tests/test_imports.py
yap_ipython/utils/tests/test_importstring.py
yap_ipython/utils/tests/test_io.py
yap_ipython/utils/tests/test_module_paths.py
yap_ipython/utils/tests/test_openpy.py
yap_ipython/utils/tests/test_path.py
yap_ipython/utils/tests/test_process.py
yap_ipython/utils/tests/test_pycolorize.py
yap_ipython/utils/tests/test_shimmodule.py
yap_ipython/utils/tests/test_sysinfo.py
yap_ipython/utils/tests/test_tempdir.py
yap_ipython/utils/tests/test_text.py
yap_ipython/utils/tests/test_tokenutil.py
yap_ipython/utils/tests/test_wildcard.py
yap_ipython/core/tests/daft_extension/daft_extension.py
__init__.py __init__.py
) )
@ -375,13 +401,17 @@ __init__.py
#yap_kernel/resourcess/logo-64x64.png #yap_kernel/resourcess/logo-64x64.png
) )
set (RENAMED_RESOURCES set (RENAMED_RESOURCES
yap_kernel/resources/logo-32x32.png
yap_kernel/resources/logo-64x64.png yap_kernel/resources/logo-32x32.png
# yap_kernel/resources/codemirror/mode/prolog/prolog.js
yap_kernel/resources/logo-64x64.png
#
yap_kernel/resources/codemirror/mode/prolog/prolog.js
) )
set (PL_SOURCES set (PL_SOURCES
yap_ipython/prolog/jupyter.yap
yap_ipython/prolog/jupyter.yap
) )
set(FILES ${PYTHON_SOURCES} ${PL_SOURCES} ${EXTRAS} ${RESOURCES}) set(FILES ${PYTHON_SOURCES} ${PL_SOURCES} ${EXTRAS} ${RESOURCES})
@ -398,7 +428,8 @@ set(FILES ${PYTHON_SOURCES} ${PL_SOURCES} ${EXTRAS} ${RESOURCES})
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-32x32.png add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-32x32.png
COMMAND ${CMAKE_COMMAND} -E make_directory yap_kernel/resources COMMAND ${CMAKE_COMMAND} -E make_directory
yap_kernel/resources
COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/docs/icons/yap_32x32x32.png ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-32x32.png COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/docs/icons/yap_32x32x32.png ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-32x32.png
DEPENDS ${CMAKE_SOURCE_DIR}/docs/icons/yap_32x32x32.png DEPENDS ${CMAKE_SOURCE_DIR}/docs/icons/yap_32x32x32.png
) )
@ -422,9 +453,11 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-
) )
add_custom_target(YAP_KERNEL ALL add_custom_target(YAP_KERNEL ALL
COMMAND ${CMAKE_COMMAND} -E tar xzf yap.tgz COMMAND ${CMAKE_COMMAND} -E tar xzf
yap.tgz
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-32x32.png ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-64x64.png yap.tgz ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/kernel.js ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/prolog.js DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-32x32.png ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/logo-64x64.png
yap.tgz ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/kernel.js ${CMAKE_CURRENT_BINARY_DIR}/yap_kernel/resources/prolog.js
) )

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

@ -2664,22 +2664,21 @@ class InteractiveShell(SingletonConfigurable):
print("go") print("go")
result = None result = None
try: try:
import trace # import trace
tracer = trace.Trace( # tracer = trace.Trace(
#ignoredirs=[sys.prefix, sys.exec_prefix], # #ignoredirs=[sys.prefix, sys.exec_prefix],
trace=1, # trace=1,
count=0) # count=0)
# run the new command using the given tracer # # run the new command using the given tracer
# # #
result =tracer.runfunc(self._yrun_cell, # result =tracer.runfunc(self._yrun_cell,
raw_cell, store_history, # raw_cell, store_history,
silent, shell_futures) # silent, shell_futures)
# result = self._yrun_cell( result = self._yrun_cell(
# raw_cell, store_history, silent, shell_futures) raw_cell, store_history, silent, shell_futures)
finally: finally:
print("ugh", self.events)
self.events.trigger('post_execute') self.events.trigger('post_execute')
if not silent: if not silent:
self.events.trigger('post_run_cell', result) self.events.trigger('post_run_cell', result)

3
packages/python/yap_kernel/yap_ipython/yapi.py
View File

@ -716,7 +716,8 @@ class YAPRun:
if linec: if linec:
self.shell.run_line_magic(magic, line) self.shell.run_line_magic(magic, line)
else: else:
self.shell.run_cell_magic(magic, line, cell) print(txt0[1])
self.shell.run_cell_magic(magic, line, txt0[1])
cell = "" cell = ""
# Give the displayhook a reference to our ExecutionResult so it # Give the displayhook a reference to our ExecutionResult so it
# can fill in the output value. # can fill in the output value.