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

undo current_predicate changes and make iso fully use LU semantics.

Browse Source 
git-svn-id: https://yap.svn.sf.net/svnroot/yap/trunk@2083 b08c6af1-5177-4d33-ba66-4b1c6b8b522a
This commit is contained in:
vsc 2008-02-08 09:49:21 +00:00
parent 62c7d4aa8b
commit 7a9e7816c9
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
C/dbase.c
View File

@ -1962,7 +1962,7 @@ p_rcda(void)
} }
UNLOCK(pe->PELock); UNLOCK(pe->PELock);
} else { } else {
TRef = 0L; TRef = MkDBRefTerm(record(MkFirst, t1, t2, Unsigned(0)));
} }
if (Yap_Error_TYPE != YAP_NO_ERROR) { if (Yap_Error_TYPE != YAP_NO_ERROR) {
if (recover_from_record_error(3)) { if (recover_from_record_error(3)) {
@ -2073,7 +2073,7 @@ p_rcdz(void)
} }
UNLOCK(pe->PELock); UNLOCK(pe->PELock);
} else { } else {
TRef = 0L; TRef = MkDBRefTerm(record(MkLast, t1, t2, Unsigned(0)));
} }
if (Yap_Error_TYPE != YAP_NO_ERROR) { if (Yap_Error_TYPE != YAP_NO_ERROR) {
if (recover_from_record_error(3)) { if (recover_from_record_error(3)) {

2
library/Tries/base_tries.h
View File

@ -40,7 +40,7 @@
#define TRIE_MODE_STANDARD 0 #define TRIE_MODE_STANDARD 0
#define TRIE_MODE_REVERSE 1 #define TRIE_MODE_REVERSE 1
#define AUXILIARY_TERM_STACK_SIZE 1000 #define AUXILIARY_TERM_STACK_SIZE 100000
#define TRIE_PRINT_NORMAL 0 #define TRIE_PRINT_NORMAL 0
#define TRIE_PRINT_FLOAT 1 #define TRIE_PRINT_FLOAT 1

4
pl/directives.yap
View File

@ -815,7 +815,7 @@ yap_flag(dialect,yap).
'$set_yap_flags'(12,0), % disable character escapes. '$set_yap_flags'(12,0), % disable character escapes.
'$set_yap_flags'(14,1), '$set_yap_flags'(14,1),
'$set_fpu_exceptions', '$set_fpu_exceptions',
unknown(_,error). unknown(_,fail).
'$adjust_language'(sicstus) :- '$adjust_language'(sicstus) :-
'$switch_log_upd'(1), '$switch_log_upd'(1),
leash(full), leash(full),
@ -833,7 +833,7 @@ yap_flag(dialect,yap).
fileerrors, fileerrors,
unknown(_,error). unknown(_,error).
'$adjust_language'(iso) :- '$adjust_language'(iso) :-
'$switch_log_upd'(2), '$switch_log_upd'(1),
'$syntax_check_mode'(_,on), '$syntax_check_mode'(_,on),
'$syntax_check_single_var'(_,on), '$syntax_check_single_var'(_,on),
'$syntax_check_discontiguous'(_,on), '$syntax_check_discontiguous'(_,on),

16
pl/preds.yap
View File

@ -939,29 +939,29 @@ system_predicate(P) :-
-> ->
functor(T,A,Arity), functor(T,A,Arity),
'$pred_exists'(T,M) '$pred_exists'(T,M)
; % ;
% '$current_predicate'(prolog,A,Arity) % '$current_predicate'(prolog,A,Arity)
% -> % ->
% functor(T,A,Arity), % functor(T,A,Arity),
% '$pred_exists'(T,M) % '$pred_exists'(T,M)
% ; % ;
recorded('$import','$import'(NM,M,G,T,A,Arity),_) % recorded('$import','$import'(NM,M,G,T,A,Arity),_)
-> % ->
'$pred_exists'(G,NM) % '$pred_exists'(G,NM)
). ).
'$current_predicate3'(M,A/Arity) :- !, '$current_predicate3'(M,A/Arity) :- !,
( (
'$current_predicate'(M,A,Arity), '$current_predicate'(M,A,Arity),
functor(T,A,Arity), functor(T,A,Arity),
'$pred_exists'(T,M) '$pred_exists'(T,M)
; % ;
% '$current_predicate'(prolog,A,Arity), % '$current_predicate'(prolog,A,Arity),
% functor(T,A,Arity), % functor(T,A,Arity),
% '$pred_exists'(T,M) % '$pred_exists'(T,M)
% ; % ;
recorded('$import','$import'(NM,M,G,T,A,Arity),_), % recorded('$import','$import'(NM,M,G,T,A,Arity),_),
functor(T,A,Arity), % functor(T,A,Arity),
'$pred_exists'(G,NM) % '$pred_exists'(G,NM)
). ).
'$current_predicate3'(M,BadSpec) :- % only for the predicate '$current_predicate3'(M,BadSpec) :- % only for the predicate
'$do_error'(type_error(predicate_indicator,BadSpec),current_predicate(M:BadSpec)). '$do_error'(type_error(predicate_indicator,BadSpec),current_predicate(M:BadSpec)).

1
pl/statistics.yap
View File

@ -132,6 +132,7 @@ key_statistics(Key, NOfEntries, TotalSize) :-
% Based on the SWI-Prolog definition minus reporting the number of inferences, % Based on the SWI-Prolog definition minus reporting the number of inferences,
% which YAP does not currently supports % which YAP does not currently supports
:- meta_predicate time(:). :- meta_predicate time(:).
time(Goal) :- time(Goal) :-