From: Mark Thom <markjordanthom@gmail.com>
Date: Wed, 19 Feb 2020 21:43:06 +0000 (-0700)
Subject: stop applying (=..)/2 to variables in tabling/trie.pl
X-Git-Tag: v0.8.118~5
X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=d3da2683cb495719b47f3ea28c111db6dedfa4f3;p=scryer-prolog.git

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

diff --git a/src/prolog/lib/tabling/trie.pl b/src/prolog/lib/tabling/trie.pl
index af3703ed..eb102df1 100644
--- a/src/prolog/lib/tabling/trie.pl
+++ b/src/prolog/lib/tabling/trie.pl
@@ -65,8 +65,13 @@
 % 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,functor_data(Name,Arity),Arguments) :-
-  Term =.. [Name|Arguments],
-  functor(Term,_,Arity).
+  (  var(Term) ->
+     Name = var,
+     Arity = 0,
+     Arguments = []
+  ;  Term =.. [Name|Arguments],
+     functor(Term,_,Arity)
+  ).
 
 % Returns a new empty 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.
 trie_insert(Trie,Key,Value) :-
   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_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.
   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),
   append(KList,Rest,KList2),
   trie_insert_1(KList2,FunctorData,Trie,Value).