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

2018-10-16 14:34:15 +01:00
parent c59b01e53c 68ce1fd045
commit 868961ebb5
43 changed files with 1932 additions and 1783 deletions
--- a/packages/python/yap_kernel/yap_ipython/prolog/jupyter.yap
+++ b/packages/python/yap_kernel/yap_ipython/prolog/jupyter.yap
@@ -41,7 +41,7 @@ jupyter_cell(Caller, _, Line ) :-
  Query = Caller,
    catch(
 	python_query(Query,Line),
-	E=error(A,B),
+	error(A,B),
 	 system_error(A,B)
    ).

@@ -69,7 +69,7 @@ jupyter_consult(Cell) :-
 	    open_mem_read_stream( Cell, Stream),
 	    load_files(user:'jupyter cell',[stream(Stream)| Options])
 	),
-	E=error(A,B),
+	error(A,B),
 	(close(Stream), system_error(A,B))
    ),
    fail.