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

fix assert/2 given name chancge

Browse Source
This commit is contained in:
Vitor Santos Costa 2016-08-26 15:23:37 -05:00
parent 76638bb7d8
commit 85a88feb6f
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/tries/core_tries.h
View File

@ -51,7 +51,7 @@
#define TRIE_PRINT_FLOAT2 2 #define TRIE_PRINT_FLOAT2 2
#define TRIE_PRINT_FLOAT_END 3 #define TRIE_PRINT_FLOAT_END 3
#define BASE_AUXILIARY_TERM_STACK_SIZE 10000 #define BASE_AUXILIARY_TERM_STACK_SIZE 100000
@ -138,13 +138,13 @@ typedef struct trie_hash {
#define MkTrieVar(INDEX) ((INDEX) << 4) #define MkTrieVar(INDEX) ((INDEX) << 4)
#define TrieVarIndex(TERM) ((TERM) >> 4) #define TrieVarIndex(TERM) ((TERM) >> 4)
#define BASE_HASH_BUCKETS 64 #define BASE_HASH_BUCKETS 256
#define MAX_NODES_PER_TRIE_LEVEL 8 #define MAX_NODES_PER_TRIE_LEVEL 32
#define MAX_NODES_PER_BUCKET (MAX_NODES_PER_TRIE_LEVEL / 2) #define MAX_NODES_PER_BUCKET (MAX_NODES_PER_TRIE_LEVEL / 2)
#define HASH_TERM(TERM, SEED) (((TERM) >> 4) & (SEED)) #define HASH_TERM(TERM, SEED) (((TERM) >> 4) & (SEED))
#define IS_HASH_NODE(NODE) (TrHash_mark(NODE) == NULL) #define IS_HASH_NODE(NODE) (TrHash_mark(NODE) == NULL)
#define BASE_SAVE_MARK 1000 /* could lead to errors if the number of different variables in a term is greater than it */ #define BASE_SAVE_MARK 10000 /* could lead to errors if the number of different variables in a term is greater than it */
#define HASH_SAVE_MARK ((YAP_Term) MkTrieVar(BASE_SAVE_MARK)) #define HASH_SAVE_MARK ((YAP_Term) MkTrieVar(BASE_SAVE_MARK))
#define ATOM_SAVE_MARK ((YAP_Term) MkTrieVar(BASE_SAVE_MARK + 1)) #define ATOM_SAVE_MARK ((YAP_Term) MkTrieVar(BASE_SAVE_MARK + 1))
#define FUNCTOR_SAVE_MARK ((YAP_Term) MkTrieVar(BASE_SAVE_MARK + 2)) #define FUNCTOR_SAVE_MARK ((YAP_Term) MkTrieVar(BASE_SAVE_MARK + 2))
@ -165,7 +165,7 @@ typedef struct trie_hash {
#define PUSH_DOWN(STACK, ITEM, STACK_TOP) \ #define PUSH_DOWN(STACK, ITEM, STACK_TOP) \
{ if (STACK > STACK_TOP) { \ { if (STACK > STACK_TOP) { \
fprintf(stderr, "**************************************\n"); \ fprintf(stderr, "**************************************\n"); \
fprintf(stderr, " Tries core module: term stack full\n"); \ fprintf(stderr, " Tries core module: term stack empty\n"); \
fprintf(stderr, "**************************************\n"); \ fprintf(stderr, "**************************************\n"); \
} \ } \
*STACK = (YAP_Term)(ITEM); \ *STACK = (YAP_Term)(ITEM); \

18
pl/preddyns.yap
View File

@ -64,7 +64,7 @@ declared dynamic.
*/ */
asserta(Clause, Ref) :- asserta(Clause, Ref) :-
'$assert'(Clause, first, Ref). '$assert'(Clause, asserta, Ref).
/** @pred assertz(+ _C_,- _R_) /** @pred assertz(+ _C_,- _R_)
@ -77,7 +77,7 @@ declared dynamic.
*/ */
assertz(Clause, Ref) :- assertz(Clause, Ref) :-
'$assert'(Clause, last, Ref). '$assert'(Clause, assertz, Ref).
/** @pred assert(+ _C_,- _R_) /** @pred assert(+ _C_,- _R_)
@ -90,14 +90,14 @@ declared dynamic.
*/ */
assert(Clause, Ref) :- assert(Clause, Ref) :-
'$assert'(Clause, last, Ref). '$assert'(Clause, assertz, Ref).
'$assertz_dynamic'(X, C, C0, Mod) :- '$assertz_dynamic'(X, C, C0, Mod) :-
(X/\4)=:=0, (X/\4)=:=0,
!, !,
'$head_and_body'(C,H,B), '$head_and_body'(C,H,B),
'$assertat_d'(last,H,B,C0,Mod,_). '$assertat_d'(assertz,H,B,C0,Mod,_).
'$assertz_dynamic'(X,C,C0,Mod) :- '$assertz_dynamic'(X,C,C0,Mod) :-
'$head_and_body'(C,H,B), '$head_and_body'(C,H,B),
functor(H,N,A), functor(H,N,A),
@ -110,7 +110,7 @@ assert(Clause, Ref) :-
; ;
true true
), ),
'$assertat_d'(last,H,B,C0,Mod,_). '$assertat_d'(assertz,H,B,C0,Mod,_).
'$remove_all_d_clauses'(H,M) :- '$remove_all_d_clauses'(H,M) :-
@ -129,8 +129,8 @@ assert(Clause, Ref) :-
fail. fail.
'$erase_all_mf_dynamic'(_,_,_). '$erase_all_mf_dynamic'(_,_,_).
'$assertat_d'(first,Head,Body,C0,Mod,R) :- !, '$assertat_d'(asserta,Head,Body,C0,Mod,R) :- !,
'$compile_dynamic'((Head:-Body), first, C0, Mod, CR), '$compile_dynamic'((Head:-Body), asserta, C0, Mod, CR),
( get_value('$abol',true) ( get_value('$abol',true)
-> ->
'$predicate_flags'(Head,Mod,Fl,Fl), '$predicate_flags'(Head,Mod,Fl,Fl),
@ -147,8 +147,8 @@ assert(Clause, Ref) :-
; ;
true true
). ).
'$assertat_d'(last,Head,Body,C0,Mod,R) :- '$assertat_d'(assertz,Head,Body,C0,Mod,R) :-
'$compile_dynamic'((Head:-Body), last, C0, Mod, CR), '$compile_dynamic'((Head:-Body), assertz, C0, Mod, CR),
( get_value('$abol',true) ( get_value('$abol',true)
-> ->
'$predicate_flags'(Head,Mod,Fl,Fl), '$predicate_flags'(Head,Mod,Fl,Fl),