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

:- G should not go top-level (obs from Ingo Molnar).

This commit is contained in:
Vítor Santos Costa 2010-05-25 16:15:09 +01:00
parent 457d5c11cb
commit 380fd692d9
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pl/boot.yap
View File

@ -197,7 +197,7 @@ true :- true.
nb_setval('$debug_run',off),
nb_setval('$debug_jump',off),
prompt(_,' |: '),
'$command'((?-Command),Varnames,Pos,top),
'$command'(Command,Varnames,Pos,top),
'$sync_mmapped_arrays',
set_value('$live','$false').
@ -357,16 +357,19 @@ true :- true.
'$nb_getval'('$if_skip_mode', skip, fail),
\+ '$if_directive'(Command),
!.
'$execute_command'((:-G),_,_,Option,_) :- !,
'$execute_command'((:-G),_,_,Option,_) :-
% !,
Option \= top, !,
'$current_module'(M),
% allow user expansion
expand_term((:- G), O),
O = (:- G1),
'$process_directive'(G1, Option, M).
'$execute_command'((?-G),V,Pos,_,Source) :- !,
'$execute_command'(G,V,Pos,top,Source).
'$execute_command'(G,V,Pos,Option,Source) :-
'$continue_with_command'(Option,V,Pos,G,Source).
'$execute_command'((?-G), V, Pos, Option, Source) :-
Option \= top, !,
'$execute_command'(G, V, Pos, top, 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.

2
pl/init.yap
View File

@ -30,6 +30,8 @@ otherwise.
(:- G) :- '$execute'(G), !.
(?- G) :- '$execute'(G).
'$$!'(CP) :- '$cut_by'(CP).
[] :- true.