Remove user:term_expansion/2 leaving only user:term_expansion/4

Author: kamahen

History.md

@@ -1,3 +1,7 @@
+# v0.9.1.8 (2022-01-08)
+
+  * Remove user:term_expansion/2 leaving only user:term_expansion/4
+
 # v0.9.1.7 (2021-04-08)
 
   * Backward-compatible work-around for => (Issue #6).

pack.pl

@@ -1,7 +1,7 @@
 name(edcg).
 
 title('Extended DCG').
-version('0.9.1.7').
+version('0.9.1.8').
 keywords([edcg, dcg, accumulator, term_expansion]).
 download('https://github.com/kamahen/edcg/archive/*.zip').
 

prolog/edcg.pl

@@ -46,25 +46,25 @@
 
 % TODO: support ((H,PB-->>B) [same as regular DCG]
 user:term_expansion((H-->>B), _Layout1, Expansion, _Layout2) :-
-    user:term_expansion((H-->>B), Expansion).
+    edcg_term_expansion((H-->>B), Expansion).
 user:term_expansion((H,PB==>>B), _Layout1, Expansion, _Layout2) :-
-    user:term_expansion((H,PB==>>B), Expansion).
+    edcg_term_expansion((H,PB==>>B), Expansion).
 user:term_expansion((H==>>B), _Layout1, Expansion, _Layout2) :-
-    user:term_expansion((H==>>B), Expansion).
+    edcg_term_expansion((H==>>B), Expansion).
 
 
 % Perform EDCG macro expansion
 % TODO: support ((H,PB-->>B) [same as regular DCG]
-user:term_expansion((H-->>B), (TH:-TB)) :-
+edcg_term_expansion((H-->>B), (TH:-TB)) :-
     term_expansion_(H, B, TH, TB, NewAcc),
     '_finish_acc'(NewAcc),
     !.
-user:term_expansion((H,PB==>>B), (TH,Guards=>TB2)) :-
+edcg_term_expansion((H,PB==>>B), (TH,Guards=>TB2)) :-
     '_guard_expansion_'(PB, Guards),
     term_expansion_(H, B, TH, TB, NewAcc),
     '_finish_acc_ssu'(NewAcc, TB, TB2),
     !.
-user:term_expansion((H==>>B), (TH=>TB2)) :-
+edcg_term_expansion((H==>>B), (TH=>TB2)) :-
     term_expansion_(H, B, TH, TB, NewAcc),
     '_finish_acc_ssu'(NewAcc, TB, TB2),
     !.