fix global variables

This commit is contained in:
Vitor Santos Costa 2010-04-08 01:44:08 +01:00
parent 3fd7da94ba
commit 066603c79b
3 changed files with 13 additions and 3 deletions

View File

@ -455,6 +455,7 @@ Yap_Error(yap_error_number type, Term where, char *format,...)
where = TermNil; where = TermNil;
Yap_PrologMode &= ~AbortMode; Yap_PrologMode &= ~AbortMode;
Yap_PrologMode |= InErrorMode; Yap_PrologMode |= InErrorMode;
P = FAILCODE;
} else { } else {
if (IsVarTerm(where)) { if (IsVarTerm(where)) {
/* we must be careful someone gave us a copy to a local variable */ /* we must be careful someone gave us a copy to a local variable */

View File

@ -102,10 +102,14 @@ true :- true.
% '$set_read_error_handler'(error), let the user do that % '$set_read_error_handler'(error), let the user do that
nb_setval('$open_expands_filename',true), nb_setval('$open_expands_filename',true),
nb_setval('$trace',off), nb_setval('$trace',off),
nb_setval('$system_mode',off),
nb_setval('$chr_toplevel_show_store',false),
nb_setval('$assert_all',off), nb_setval('$assert_all',off),
nb_setval('$if_skip_mode',no_skip), nb_setval('$if_skip_mode',no_skip),
b_setval('$spy_glist',[]), b_setval('$spy_glist',[]),
nb_setval('$spy_gn',1). nb_setval('$spy_gn',1),
nb_setval('$debug_run',off),
nb_setval('$debug_jump',off).
'$init_consult' :- '$init_consult' :-
nb_setval('$lf_verbose',informational), nb_setval('$lf_verbose',informational),
@ -191,7 +195,7 @@ true :- true.
nb_setval('$spy_gn',1), nb_setval('$spy_gn',1),
% stop at spy-points if debugging is on. % stop at spy-points if debugging is on.
nb_setval('$debug_run',off), nb_setval('$debug_run',off),
nb_setval('$debug_zip',off), nb_setval('$debug_jump',off),
prompt(_,' |: '), prompt(_,' |: '),
'$command'((?-Command),Varnames,Pos,top), '$command'((?-Command),Varnames,Pos,top),
'$sync_mmapped_arrays', '$sync_mmapped_arrays',
@ -1010,6 +1014,8 @@ break :-
nb_getval('$system_mode',SystemMode), nb_getval('$system_mode',SystemMode),
nb_getval('$trace',Trace), nb_getval('$trace',Trace),
nb_setval('$trace',off), nb_setval('$trace',off),
nb_getval('$debug_jump',Jump),
nb_getval('$debug_run',Run),
'$debug_on'(Debug), '$debug_on'(Debug),
'$debug_on'(false), '$debug_on'(false),
nb_getval('$break',BL), NBL is BL+1, nb_getval('$break',BL), NBL is BL+1,
@ -1026,6 +1032,8 @@ break :-
nb_setval('$spy_gn',SPY_GN), nb_setval('$spy_gn',SPY_GN),
'$set_input'(InpStream), '$set_output'(OutStream), '$set_input'(InpStream), '$set_output'(OutStream),
'$debug_on'(Debug), '$debug_on'(Debug),
nb_setval('$debug_jump',Jump),
nb_setval('$debug_run',Run),
nb_setval('$trace',Trace), nb_setval('$trace',Trace),
nb_setval('$break',BL), nb_setval('$break',BL),
nb_setval('$system_mode',SystemMode). nb_setval('$system_mode',SystemMode).

View File

@ -184,7 +184,8 @@
'$creep'. '$creep'.
% do not debug if we are zipping through. % do not debug if we are zipping through.
'$start_creep'([Mod|G]) :- '$start_creep'([Mod|G]) :-
nb_getval('$debug_zip',on), nb_getval('$debug_run',Run),
Run \= off,
'$zip'(-1, G, Mod), !, '$zip'(-1, G, Mod), !,
'$signal_creep', '$signal_creep',
'$execute_nonstop'(G,Mod). '$execute_nonstop'(G,Mod).