:- G should not go top-level (obs from Ingo Molnar).
This commit is contained in:
parent
457d5c11cb
commit
380fd692d9
15
pl/boot.yap
15
pl/boot.yap
@ -197,7 +197,7 @@ true :- true.
|
|||||||
nb_setval('$debug_run',off),
|
nb_setval('$debug_run',off),
|
||||||
nb_setval('$debug_jump',off),
|
nb_setval('$debug_jump',off),
|
||||||
prompt(_,' |: '),
|
prompt(_,' |: '),
|
||||||
'$command'((?-Command),Varnames,Pos,top),
|
'$command'(Command,Varnames,Pos,top),
|
||||||
'$sync_mmapped_arrays',
|
'$sync_mmapped_arrays',
|
||||||
set_value('$live','$false').
|
set_value('$live','$false').
|
||||||
|
|
||||||
@ -357,16 +357,19 @@ true :- true.
|
|||||||
'$nb_getval'('$if_skip_mode', skip, fail),
|
'$nb_getval'('$if_skip_mode', skip, fail),
|
||||||
\+ '$if_directive'(Command),
|
\+ '$if_directive'(Command),
|
||||||
!.
|
!.
|
||||||
'$execute_command'((:-G),_,_,Option,_) :- !,
|
'$execute_command'((:-G),_,_,Option,_) :-
|
||||||
|
% !,
|
||||||
|
Option \= top, !,
|
||||||
'$current_module'(M),
|
'$current_module'(M),
|
||||||
% allow user expansion
|
% allow user expansion
|
||||||
expand_term((:- G), O),
|
expand_term((:- G), O),
|
||||||
O = (:- G1),
|
O = (:- G1),
|
||||||
'$process_directive'(G1, Option, M).
|
'$process_directive'(G1, Option, M).
|
||||||
'$execute_command'((?-G),V,Pos,_,Source) :- !,
|
'$execute_command'((?-G), V, Pos, Option, Source) :-
|
||||||
'$execute_command'(G,V,Pos,top,Source).
|
Option \= top, !,
|
||||||
'$execute_command'(G,V,Pos,Option,Source) :-
|
'$execute_command'(G, V, Pos, top, Source).
|
||||||
'$continue_with_command'(Option,V,Pos,G,Source).
|
'$execute_command'(G, V, Pos, Option, Source) :-
|
||||||
|
'$continue_with_command'(Option, V, Pos, G, Source).
|
||||||
|
|
||||||
%
|
%
|
||||||
% This command is very different depending on the language mode we are in.
|
% This command is very different depending on the language mode we are in.
|
||||||
|
@ -30,6 +30,8 @@ otherwise.
|
|||||||
|
|
||||||
(:- G) :- '$execute'(G), !.
|
(:- G) :- '$execute'(G), !.
|
||||||
|
|
||||||
|
(?- G) :- '$execute'(G).
|
||||||
|
|
||||||
'$$!'(CP) :- '$cut_by'(CP).
|
'$$!'(CP) :- '$cut_by'(CP).
|
||||||
|
|
||||||
[] :- true.
|
[] :- true.
|
||||||
|
Reference in New Issue
Block a user