harmonize partial strings with complete strings (#276), make Addr a copyable type

src/prolog/lib/atts.pl

@@ -132,11 +132,11 @@ put_attr(Name, Arity) -->
 			    '$put_attr'(V, Attr)),
      (put_atts(V,  Attr) :- !, functor(Attr, Head, Arity),
 			    functor(AttrForm, Head, Arity),
-			    '$get_attr_list'(V, Ls), 
-			    '$del_attr'(Ls, V, AttrForm), 
+			    '$get_attr_list'(V, Ls),
+			    '$del_attr'(Ls, V, AttrForm),
 			    '$put_attr'(V, Attr)),
      (put_atts(V, -Attr) :- !, functor(Attr, _, _),
-			    '$get_attr_list'(V, Ls), 
+			    '$get_attr_list'(V, Ls),
 			    '$del_attr'(Ls, V, Attr))].
 
 get_attr(Name, Arity) -->
@@ -158,4 +158,3 @@ call_residue_vars(Goal, Vars) :-
     '$get_attr_var_queue_delim'(B),
     call(Goal),
     '$get_attr_var_queue_beyond'(B, Vars).
-    

src/prolog/lib/builtins.pl

@@ -262,8 +262,11 @@ univ_errors(Term, List, N) :-
 Term =.. List :- '$call_with_default_policy'(univ_errors(Term, List, N)),
 		 '$call_with_default_policy'(univ_worker(Term, List, N)).
 
+
 :- non_counted_backtracking univ_worker/3.
-univ_worker(Term, List, _) :- atomic(Term), !, '$call_with_default_policy'(List = [Term]).
+
+univ_worker(Term, List, _) :-
+    atomic(Term), !, '$call_with_default_policy'(List = [Term]).
 univ_worker(Term, [Name|Args], N) :-
     var(Term), !,
     '$call_with_default_policy'(Arity is N-1),
@@ -274,7 +277,9 @@ univ_worker(Term, List, _) :-
     '$call_with_default_policy'(get_args(Args, Term, 1, Arity)),
     '$call_with_default_policy'(List = [Name|Args]).
 
+
 :- non_counted_backtracking get_args/4.
+
 get_args(Args, _, _, 0) :-
     !, '$call_with_default_policy'(Args = []).
 get_args([Arg], Func, N, N) :-
@@ -287,19 +292,19 @@ get_args([Arg|Args], Func, I0, N) :-
 % write, write_canonical, writeq, write_term.
 is_write_option(Functor) :-
     Functor =.. [Name, Arg],
-    ( Arg == true -> true
-    ; Arg == false -> true
-    ; Name == variable_names -> must_be_var_names_list(Arg)
-    ; Name == max_depth -> integer(Arg), Arg >= 0
-    ; var(Arg) -> throw(error(instantiation_error, write_term/2))
-    ; throw(error(domain_error(write_option, Functor), write_term/2))
+    (  Arg == true -> true
+    ;  Arg == false -> true
+    ;  Name == variable_names -> must_be_var_names_list(Arg)
+    ;  Name == max_depth -> integer(Arg), Arg >= 0
+    ;  var(Arg) -> throw(error(instantiation_error, write_term/2))
+    ;  throw(error(domain_error(write_option, Functor), write_term/2))
     ), % 8.14.2.3 e)
-    ( Name == ignore_ops -> true
-    ; Name == quoted -> true
-    ; Name == numbervars -> true
-    ; Name == variable_names -> true
-    ; Name == max_depth -> true
-    ; throw(error(domain_error(write_option, Functor), write_term/2))
+    (  Name == ignore_ops -> true
+    ;  Name == quoted -> true
+    ;  Name == numbervars -> true
+    ;  Name == variable_names -> true
+    ;  Name == max_depth -> true
+    ;  throw(error(domain_error(write_option, Functor), write_term/2))
     ). % 8.14.2.3 e)
 
 inst_member_or([X|Xs], Y, Z) :-

src/prolog/lib/cont.pl

@@ -1,4 +1,3 @@
-
 :- module(cont, [reset/3, shift/1]).
 
 reset(Goal, Ball, Cont) :-
@@ -7,14 +6,14 @@ reset(Goal, Ball, Cont) :-
     '$bind_from_register'(Cont, 3),
     '$bind_from_register'(Ball, 4).
 
-shift(Term) :-
+shift(Ball) :-
     '$nextEP'(first, E, P),
     get_chunks(E, P, L),
     (  L == [] ->
        Cont = none
     ;  Cont = cont(call_continuation(L))
     ),
-    '$write_cont_and_term'(_, _, Cont, Term),
+    '$write_cont_and_term'(_, _, Cont, Ball),
     '$unwind_environments'.
 
 get_chunks(E, P, L) :-

src/prolog/lib/tabling.pl

@@ -135,7 +135,7 @@ activate(Wrapper,Worker,T) :-
 
 delim(Wrapper,Worker,Table) :-
 %   debug(tabling, 'ACT: ~p on ~p', [Wrapper, Table]),
-   reset(Worker,SourceCall,Continuation),
+    reset(Worker,SourceCall,Continuation),
    ( Continuation == none, var(SourceCall) ->
      (	 add_answer(Table,Wrapper)
      ->	 true %debug(tabling, 'ADD: ~p', [Wrapper])
@@ -144,9 +144,9 @@ delim(Wrapper,Worker,Table) :-
      )
    ;
      (   Continuation = cont(Cont) ->
-	 true
+	     true
      ;   Continuation = none ->
-	 Cont = true
+	     Cont = true
      ),
      SourceCall = call_info(_,SourceTable),
      TargetCall = call_info(Wrapper,Table),
@@ -178,7 +178,7 @@ completion_step(SourceTableID) :-
     fail
   ;
     true
-  ).  
+  ).
 
 table_get_work(NBWorklistID,Answer,Dependency) :-
   % get_worklist(Table, Worklist),
@@ -192,7 +192,7 @@ table_get_work(NBWorklistID,Answer,Dependency) :-
 table_get_work_(NBWorklistID,Answer,Dependency) :-
   worklist_do_all_work(NBWorklistID,Answer,Dependency0), % This will eventually fail
   copy_term(Dependency0,Dependency).
-  
+
 table_get_work_(NBWorklistID,_Answer,_Dependency) :-
   bb_get(NBWorklistID, table_nb_worklist(Worklist)),
   unset_flag_executing_all_work(Worklist),

src/prolog/lib/tabling/double_linked_list.pl

@@ -208,4 +208,3 @@ dll_get_reverse_contents_(List, Contents) :-
        dll_get_pointer_to_previous(List, Prev),
        dll_get_reverse_contents_(Prev, Rest)
     ).
-

src/prolog/lib/tabling/global_worklist.pl

@@ -1,4 +1,4 @@
-/*    Ported to Scryer Prolog by Mark Thom (2019/2020). 
+/*    Ported to Scryer Prolog by Mark Thom (2019/2020).
  */
 
 :- module(global_worklist,
@@ -21,7 +21,7 @@ put_new_global_worklist :-
      bb_b_put(table_global_worklist_initialized, [])
   ).
 
-add_to_global_worklist(TableIdentifier) :-  
+add_to_global_worklist(TableIdentifier) :-
   bb_get(table_global_worklist, TableGlobalWorklistFlag),
   get_atts(TableGlobalWorklistFlag, table_global_worklist(L1)),
   put_atts(TableGlobalWorklistFlag, table_global_worklist([TableIdentifier|L1])),
@@ -34,7 +34,7 @@ worklist_empty :-
 
 pop_worklist(TableIdentifier) :-
   bb_get(table_global_worklist,TableGlobalWorklistFlag),
-  get_atts(TableGlobalWorklistFlag, table_global_worklist(L1)),  
+  get_atts(TableGlobalWorklistFlag, table_global_worklist(L1)),
   L1 = [TableIdentifier|L2],
   put_atts(TableGlobalWorklistFlag, table_global_worklist(L2)),
   bb_put(table_global_worklist, TableGlobalWorklistFlag).

src/prolog/lib/tabling/trie.pl

@@ -187,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).