rishi/scryer-prolog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stop applying (=..)/2 to variables in tabling/trie.pl

Browse Source
This commit is contained in:
Mark Thom
2020-02-19 14:43:06 -07:00
parent 8902bcb5ab
commit d3da2683cb
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/prolog/lib/tabling/trie.pl
View File

@@ -65,8 +65,13 @@
% For a term of the form p(a,q(b)), "returns" functor_data(p,2) and [a,q(b)]. % For a term of the form p(a,q(b)), "returns" functor_data(p,2) and [a,q(b)].
% p_trie_arity_univ(+Term,-FunctorData,-ArgumentsList). % p_trie_arity_univ(+Term,-FunctorData,-ArgumentsList).
p_trie_arity_univ(Term,functor_data(Name,Arity),Arguments) :- p_trie_arity_univ(Term,functor_data(Name,Arity),Arguments) :-
Term =.. [Name|Arguments], ( var(Term) ->
functor(Term,_,Arity). Name = var,
Arity = 0,
Arguments = []
; Term =.. [Name|Arguments],
functor(Term,_,Arity)
).
% Returns a new empty trie. % Returns a new empty trie.
trie_new(Trie) :- trie_new(Trie) :-
@@ -110,7 +115,7 @@ trie_insert_succeed(Trie,Key,Value) :-
% We don't use an extra argument to indicate earlier presence, as this increases the trail size. % We don't use an extra argument to indicate earlier presence, as this increases the trail size.
trie_insert(Trie,Key,Value) :- trie_insert(Trie,Key,Value) :-
p_trie_arity_univ(Key,FunctorData,KeyList), p_trie_arity_univ(Key,FunctorData,KeyList),
trie_insert_1(KeyList,FunctorData,Trie,Value). trie_insert_1(KeyList,FunctorData,Trie,Value).
trie_insert_1([],FunctorData,Trie,Value) :- trie_insert_1([],FunctorData,Trie,Value) :-
trie_get_children(Trie,Assoc), trie_get_children(Trie,Assoc),
@@ -182,7 +187,7 @@ trie_insert_1_1_1(>,_V,_L,R,Assoc,FunctorData,Trie,First,Rest,Value) :-
% Look in the right part of the assoc tree. % Look in the right part of the assoc tree.
trie_insert_1_1(R,Assoc,FunctorData,Trie,First,Rest,Value). trie_insert_1_1(R,Assoc,FunctorData,Trie,First,Rest,Value).
trie_insert_2(RegularTerm,Rest,Trie,Value) :- trie_insert_2(RegularTerm,Rest,Trie,Value) :-
p_trie_arity_univ(RegularTerm,FunctorData,KList), p_trie_arity_univ(RegularTerm,FunctorData,KList),
append(KList,Rest,KList2), append(KList,Rest,KList2),
trie_insert_1(KList2,FunctorData,Trie,Value). trie_insert_1(KList2,FunctorData,Trie,Value).