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

fix halt/0 and halt/1

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@1051 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2004-04-27 15:14:38 +00:00
parent e6cab52dc2
commit 40e84ca034
3 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
C/stdpreds.c
View File

@ -9,10 +9,11 @@
************************************************************************** **************************************************************************
* * * *
* File: stdpreds.c * * File: stdpreds.c *
* Last rev: *
* mods: *
* comments: General-purpose C implemented system predicates * * comments: General-purpose C implemented system predicates *
* * * *
* Last rev: $Date: 2004-04-27 15:14:36 $,$Author: vsc $ *
* $Log: not supported by cvs2svn $ *
* *
*************************************************************************/ *************************************************************************/
#ifdef SCCS #ifdef SCCS
static char SccsId[] = "%W% %G%"; static char SccsId[] = "%W% %G%";
@ -65,7 +66,6 @@ STD_PROTO(static Int p_number_codes, (void));
STD_PROTO(static Int p_univ, (void)); STD_PROTO(static Int p_univ, (void));
STD_PROTO(static Int p_abort, (void)); STD_PROTO(static Int p_abort, (void));
STD_PROTO(static Int p_halt, (void)); STD_PROTO(static Int p_halt, (void));
STD_PROTO(static Int p_halt0, (void));
STD_PROTO(static Int init_current_atom, (void)); STD_PROTO(static Int init_current_atom, (void));
STD_PROTO(static Int cont_current_atom, (void)); STD_PROTO(static Int cont_current_atom, (void));
STD_PROTO(static Int init_current_predicate, (void)); STD_PROTO(static Int init_current_predicate, (void));
@ -1717,26 +1717,8 @@ p_halt(void)
return(FALSE); return(FALSE);
} }
out = IntegerOfTerm(t); out = IntegerOfTerm(t);
if (yap_flags[HALT_AFTER_CONSULT_FLAG]) {
Yap_exit(out); Yap_exit(out);
} else { return TRUE;
fprintf(Yap_stderr, "\n\n[ Prolog execution halted ]\n");
Yap_exit(out);
}
return (TRUE);
}
static Int
p_halt0(void)
{ /* halt */
if (yap_flags[HALT_AFTER_CONSULT_FLAG]) {
Yap_exit(0);
} else {
fprintf(Yap_stderr, "\n\n[ Prolog execution halted ]\n");
Yap_exit(0);
}
return (TRUE);
} }
@ -2726,8 +2708,7 @@ Yap_InitCPreds(void)
Yap_InitCPred("$access_yap_flags", 2, p_access_yap_flags, SafePredFlag); Yap_InitCPred("$access_yap_flags", 2, p_access_yap_flags, SafePredFlag);
Yap_InitCPred("$set_yap_flags", 2, p_set_yap_flags, SafePredFlag|SyncPredFlag); Yap_InitCPred("$set_yap_flags", 2, p_set_yap_flags, SafePredFlag|SyncPredFlag);
Yap_InitCPred("abort", 0, p_abort, SyncPredFlag); Yap_InitCPred("abort", 0, p_abort, SyncPredFlag);
Yap_InitCPred("halt", 1, p_halt, SyncPredFlag); Yap_InitCPred("$halt", 1, p_halt, SyncPredFlag);
Yap_InitCPred("halt", 0, p_halt0, SyncPredFlag);
Yap_InitCPred("$host_type", 1, p_host_type, SyncPredFlag); Yap_InitCPred("$host_type", 1, p_host_type, SyncPredFlag);
Yap_InitCPred("$lock_system", 0, p_lock_system, SafePredFlag); Yap_InitCPred("$lock_system", 0, p_lock_system, SafePredFlag);
Yap_InitCPred("$unlock_system", 0, p_unlock_system, SafePredFlag); Yap_InitCPred("$unlock_system", 0, p_unlock_system, SafePredFlag);

2
pl/errors.yap
View File

@ -81,6 +81,8 @@ print_message(Level, Mss) :-
'$format'(user_error, '~n', []). '$format'(user_error, '~n', []).
'$do_informational_message'(halt) :- !,
'$format'(user_error, '[ Prolog execution halted ]~n', []).
'$do_informational_message'(abort(_)) :- !, '$do_informational_message'(abort(_)) :- !,
'$format'(user_error, '[ Execution Aborted ]~n', []). '$format'(user_error, '[ Execution Aborted ]~n', []).
'$do_informational_message'(loading(_,user)) :- !. '$do_informational_message'(loading(_,user)) :- !.

10
pl/utils.yap
View File

@ -687,3 +687,13 @@ version(T) :-
recorda('$toplevel_hooks',H,_), recorda('$toplevel_hooks',H,_),
fail. fail.
'$set_toplevel_hook'(_). '$set_toplevel_hook'(_).
halt(X) :- '$halt'(X).
halt :-
'$print_message'(informational, halt),
'$halt'(0).
halt(X) :-
'$halt'(X).