modules

os/readterm.c

@@ -1851,9 +1851,15 @@ static Term syntax_error(TokEntry *errtok, int sno, Term cmod, Int newpos, bool
   {
     Term t1 = Deref(ARG1);
     int l = push_text_stack();
+    Term cm = CurrentModule;
+    if (IsApplTerm(t1)) {
+      Term tmod = LOCAL_SourceModule;
+      t1 = Yap_YapStripModule(t1, &tmod);
+      CurrentModule = tmod;
+    }
     const unsigned char *s = Yap_TextToUTF8Buffer(t1 PASS_REGS);
     Int rc = Yap_UBufferToTerm(s, add_output(ARG2, add_names(ARG3, TermNil)));
-
+    CurrentModule = cm;
     pop_text_stack(l);
     return rc;
   }

packages/python/swig/prolog/yapi.yap

@@ -28,7 +28,7 @@
 :- python_import(json).
 %:- python_import(gc).
 
-:- meta_predicate( yapi_query(:,+) ).
+:- meta_predicate yapi_query(:,+), python_query(+,:), python_query(+,:,-) .
 
 %:- start_low_level_trace.
 

packages/python/yap_kernel/yap_ipython/prolog/jupyter.yap

@@ -37,7 +37,8 @@ u
 
 :- python_import(sys).
 
-
+:- meta_predicate jupyter_query(+,:,+,-), jupyter_query(+,:,+).
+	   
 jupyter_query(Caller, Cell, Line, Bindings ) :-
     gated_call(
 	streams(true),

pl/debug.yap

@@ -463,7 +463,7 @@ be lost.
     '$trace_is_off'(M:G,GoalNumber),
 	!,
 	'$execute_nonstop'(G,M).
-'$trace_goal'(G, M, GoalNumber, H) :-
+'$trace_goal'(G, M, _GoalNumber, _H) :-
 	'$undefined'(G, M),
 	!,
 	  '$undefp'([M|G], _ ).
@@ -848,7 +848,7 @@ be lost.
 '$action'(s,P,CallNumber,_,_,_) :- !,		% 's		skip
      '$scan_number'(ScanNumber),		
      ( ScanNumber == 0 -> Goal = CallNumber ; Goal = ScanNumber ),
-	( (P=call; P=redo) ->
+	( (P==call; P==redo) ->
              '__NB_setval__'('$debug_status', state(leap, Goal, ignore) ) ;
 	    '$ilgl'(s)				% '
 	).

pl/spy.yap

@@ -430,7 +430,7 @@ notrace(G) :-
     ->
     true
     ;
-    GN > G0
+    GN > GN0
    ). 
 
 

pl/top.yap

@@ -82,7 +82,7 @@ live :-
 				% stop at spy-points if debugging is on.
 	nb_setval('$debug_run',off),
 	nb_setval('$debug_jump',off),
-	nb_setval('$debug_status', state(zip, 0, stop), fail)
+	nb_setval('$debug_status', state(zip, 0, stop), fail),
 	'$command'(Command,Varnames,Pos,top),
 	current_prolog_flag(break_level, BreakLevel),
 	(
@@ -715,9 +715,10 @@ write_query_answer( Bindings ) :-
     prolog_flag(agc_margin,Old,0),
     prompt1(': '), prompt(_,'     '),
     '$current_module'(OldModule),
-    repeat,
-    '$system_catch'(dbload_from_stream(Stream, OldModule, db), '$db_load', Error,
-		    prolog_flag(agc_margin,_,Old),
+	repeat,
+		'$system_catch'(dbload_from_stream(Stream, OldModule, db), '$db_load', Error, user:'$LoopError'(Error, db)
+                   ),
+		prolog_flag(agc_margin,_,Old),
 	!.
 '$loop'(Stream,Status) :-
     repeat,