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

fix a:[a] to consult a in a.

Browse Source 
make [] predefined and true.


git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@222 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2001-12-11 04:35:31 +00:00
parent 6a34f51a25
commit 6fd1a332d1
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pl/boot.yap
View File

@ -113,7 +113,7 @@ true :- true. % otherwise, $$compile will ignore this clause.
'$recorded'('$restore_goal',G,R), '$recorded'('$restore_goal',G,R),
erase(R), erase(R),
prompt(_,' | '), prompt(_,' | '),
'$system_catch'('$do_yes_no'((G->true)),Error,user:'$Error'(Error)), '$system_catch'('$do_yes_no'((G->true),user),Error,user:'$Error'(Error)),
fail. fail.
'$enter_top_level' :- '$enter_top_level' :-
( '$get_value'('$trace', 1) -> ( '$get_value'('$trace', 1) ->
@ -290,7 +290,7 @@ repeat :- '$repeat'.
% but YAP and SICStus does. % but YAP and SICStus does.
% %
'$process_directive'(G, _, M) :- '$process_directive'(G, _, M) :-
( '$do_yes_no'(M:G) -> true ; '$format'(user_error,":- ~w:~w failed.~n",[M,G]) ). ( '$do_yes_no'(G,M) -> true ; '$format'(user_error,":- ~w:~w failed.~n",[M,G]) ).
'$all_directives'(M:G1) :- !, '$all_directives'(M:G1) :- !,
'$all_directives'(G1). '$all_directives'(G1).
@ -447,7 +447,8 @@ repeat :- '$repeat'.
). ).
'$yes_no'(G,C) :- '$yes_no'(G,C) :-
'$do_yes_no'(G), '$current_module'(M),
'$do_yes_no'(G,M),
'$show_frozen'(G, [], LGs), '$show_frozen'(G, [], LGs),
'$write_answer'([], LGs, Written), '$write_answer'([], LGs, Written),
( Written = [] -> ( Written = [] ->
@ -460,8 +461,8 @@ repeat :- '$repeat'.
fail. fail.
'$do_yes_no'([X|L]) :- !, '$csult'([X|L]). '$do_yes_no'([X|L], M) :- !, '$csult'([X|L], M).
'$do_yes_no'(G) :- '$execute'(G). '$do_yes_no'(G, M) :- '$execute'(M:G).
'$extract_goal_vars_for_dump'([],[]). '$extract_goal_vars_for_dump'([],[]).
'$extract_goal_vars_for_dump'([[_|V]|VL],[V|LIV]) :- '$extract_goal_vars_for_dump'([[_|V]|VL],[V|LIV]) :-
@ -713,8 +714,8 @@ not(A) :-
\+ '$execute'(X). \+ '$execute'(X).
'$call'(!, CP, _,_) :- !, '$call'(!, CP, _,_) :- !,
'$$cut_by'(CP). '$$cut_by'(CP).
'$call'([A|B],_, _,_) :- !, '$call'([A|B], _, _, M) :- !,
'$csult'([A|B]). '$csult'([A|B], M).
'$call'(A, _, _,CurMod) :- '$call'(A, _, _,CurMod) :-
( (
% goal_expansion is defined, or % goal_expansion is defined, or
@ -762,8 +763,8 @@ not(A) :-
\+ '$execute'(X). \+ '$execute'(X).
'$spied_call'(!,CP,_,_) :- '$spied_call'(!,CP,_,_) :-
'$$cut_by'(CP). '$$cut_by'(CP).
'$spied_call'([A|B],_,_,_) :- !, '$spied_call'([A|B],_,_,M) :- !,
'$csult'([A|B]). '$csult'([A|B], M).
'$spied_call'(A, _CP, _G0, CurMod) :- '$spied_call'(A, _CP, _G0, CurMod) :-
( (
% goal_expansion is defined, or % goal_expansion is defined, or
@ -841,11 +842,11 @@ break :- '$get_value'('$break',BL), NBL is BL+1,
'$set_value'('$break',BL). '$set_value'('$break',BL).
'$csult'(V) :- var(V), !, '$csult'(V, _) :- var(V), !,
throw(error(instantiation_error,consult(V))). throw(error(instantiation_error,consult(V))).
'$csult'([]) :- !. '$csult'([], _) :- !.
'$csult'([-F|L]) :- !, '$reconsult'(F), '$csult'(L). '$csult'([-F|L], M) :- !, '$reconsult'(M:F), '$csult'(L, M).
'$csult'([F|L]) :- '$consult'(F), '$csult'(L). '$csult'([F|L], M) :- '$consult'(M:F), '$csult'(L, M).
'$consult'(V) :- var(V), !, '$consult'(V) :- var(V), !,
throw(error(instantiation_error,consult(V))). throw(error(instantiation_error,consult(V))).

1
pl/init.yap
View File

@ -26,6 +26,7 @@ false :- false.
!. !.
(:- G) :- '$execute'(G), !. (:- G) :- '$execute'(G), !.
'$$!'(CP) :- '$cut_by'(CP). '$$!'(CP) :- '$cut_by'(CP).
[] :- true.
:- '$set_value'('$doindex',true). :- '$set_value'('$doindex',true).