From b2e50b42a3c5aedc41496def792392c9e5d84c28 Mon Sep 17 00:00:00 2001 From: Mark Thom Date: Sat, 22 Feb 2020 00:58:37 -0700 Subject: [PATCH] rename non_iso.pl to iso_ext.pl (#265) --- README.md | 4 ++-- src/prolog/lib/builtins.pl | 2 +- src/prolog/lib/clpb.pl | 2 +- src/prolog/lib/gensym.pl | 2 +- src/prolog/lib/{non_iso.pl => iso_ext.pl} | 4 ++-- src/prolog/lib/tabling.pl | 2 +- src/prolog/lib/tabling/global_worklist.pl | 2 +- src/prolog/lib/tabling/table_data_structure.pl | 2 +- src/prolog/lib/tabling/table_link_manager.pl | 2 +- src/prolog/machine/machine_indices.rs | 6 +++--- src/prolog/machine/mod.rs | 4 ++-- src/tests/builtins.pl | 2 +- src/tests/call_with_inference_limit.pl | 2 +- src/tests/setup_call_cleanup.pl | 2 +- 14 files changed, 19 insertions(+), 19 deletions(-) rename src/prolog/lib/{non_iso.pl => iso_ext.pl} (98%) diff --git a/README.md b/README.md index bc134e22..b605d9d1 100644 --- a/README.md +++ b/README.md @@ -205,9 +205,9 @@ characters, but their characters are packed in UTF-8 format, a much more efficient alternative to how lists of characters are represented in many other Prologs. -To use partial strings, the `non_iso` library must be loaded: +To use partial strings, the `iso_ext` library must be loaded: -`?- use_module(library(non_iso)).` +`?- use_module(library(iso_ext)).` If `X` is a free variable, the query diff --git a/src/prolog/lib/builtins.pl b/src/prolog/lib/builtins.pl index 5ff87d07..2ac2ec38 100644 --- a/src/prolog/lib/builtins.pl +++ b/src/prolog/lib/builtins.pl @@ -448,7 +448,7 @@ set_difference([], _, []) :- !. set_difference(Xs, [], Xs). group_by_variant([V2-S2 | Pairs], V1-S1, [S2 | Solutions], Pairs0) :- - non_iso:variant(V1, V2), !, V1 = V2, group_by_variant(Pairs, V2-S2, Solutions, Pairs0). + iso_ext:variant(V1, V2), !, V1 = V2, group_by_variant(Pairs, V2-S2, Solutions, Pairs0). group_by_variant(Pairs, _, [], Pairs). group_by_variants([V-S|Pairs], [V-Solution|Solutions]) :- diff --git a/src/prolog/lib/clpb.pl b/src/prolog/lib/clpb.pl index 46996e06..d66257ee 100644 --- a/src/prolog/lib/clpb.pl +++ b/src/prolog/lib/clpb.pl @@ -30,7 +30,7 @@ :- use_module(library(between)). :- use_module(library(atts)). :- use_module(library(lists)). -:- use_module(library(non_iso)). +:- use_module(library(iso_ext)). :- use_module(library(pairs)). :- use_module(library(dcgs)). :- use_module(library(error), []). diff --git a/src/prolog/lib/gensym.pl b/src/prolog/lib/gensym.pl index 27c34f99..92cd4d1f 100644 --- a/src/prolog/lib/gensym.pl +++ b/src/prolog/lib/gensym.pl @@ -3,7 +3,7 @@ :- use_module(library(error)). :- use_module(library(lists)). -:- use_module(library(non_iso)). +:- use_module(library(iso_ext)). :- use_module(library(si)). gensym_key(Base, BaseKey) :- diff --git a/src/prolog/lib/non_iso.pl b/src/prolog/lib/iso_ext.pl similarity index 98% rename from src/prolog/lib/non_iso.pl rename to src/prolog/lib/iso_ext.pl index 7c7e6dee..f91215ac 100644 --- a/src/prolog/lib/non_iso.pl +++ b/src/prolog/lib/iso_ext.pl @@ -1,9 +1,9 @@ %% for builtins that are not part of the ISO standard. %% must be loaded at the REPL with -%% ?- use_module(library(non_iso)). +%% ?- use_module(library(iso_ext)). -:- module(non_iso, [bb_b_put/2, bb_get/2, bb_put/2, call_cleanup/2, +:- module(iso_ext, [bb_b_put/2, bb_get/2, bb_put/2, call_cleanup/2, call_with_inference_limit/3, forall/2, maybe/0, partial_string/1, partial_string/3, partial_string_tail/2, set_random/1, diff --git a/src/prolog/lib/tabling.pl b/src/prolog/lib/tabling.pl index d925b18a..0c2aa766 100644 --- a/src/prolog/lib/tabling.pl +++ b/src/prolog/lib/tabling.pl @@ -18,7 +18,7 @@ :- use_module(library(cont)). :- use_module(library(lists)). %:- use_module(library(debug)). -:- use_module(library(non_iso)). +:- use_module(library(iso_ext)). %% :- meta_predicate %% start_tabling(+, 0). diff --git a/src/prolog/lib/tabling/global_worklist.pl b/src/prolog/lib/tabling/global_worklist.pl index 0a87e41f..dbe8b4c5 100644 --- a/src/prolog/lib/tabling/global_worklist.pl +++ b/src/prolog/lib/tabling/global_worklist.pl @@ -9,7 +9,7 @@ ]). :- use_module(library(atts)). -:- use_module(library(non_iso)). +:- use_module(library(iso_ext)). :- attribute table_global_worklist/1. diff --git a/src/prolog/lib/tabling/table_data_structure.pl b/src/prolog/lib/tabling/table_data_structure.pl index 92cb085a..b4fc6121 100644 --- a/src/prolog/lib/tabling/table_data_structure.pl +++ b/src/prolog/lib/tabling/table_data_structure.pl @@ -57,7 +57,7 @@ :- use_module(library(atts)). :- use_module(library(gensym)). -:- use_module(library(non_iso)). +:- use_module(library(iso_ext)). :- attribute table_status/1, newly_created_table_identifiers/1. diff --git a/src/prolog/lib/tabling/table_link_manager.pl b/src/prolog/lib/tabling/table_link_manager.pl index 30a5bc6b..c688d0cd 100644 --- a/src/prolog/lib/tabling/table_link_manager.pl +++ b/src/prolog/lib/tabling/table_link_manager.pl @@ -44,7 +44,7 @@ :- use_module(library(atts)). :- use_module(library(lists)). -:- use_module(library(non_iso)). +:- use_module(library(iso_ext)). :- use_module(library(terms)). :- use_module(trie). diff --git a/src/prolog/machine/machine_indices.rs b/src/prolog/machine/machine_indices.rs index 9805699a..142d30e1 100644 --- a/src/prolog/machine/machine_indices.rs +++ b/src/prolog/machine/machine_indices.rs @@ -740,13 +740,13 @@ impl IndexStore { let r_w_h = clause_name!("run_cleaners_with_handling"); let r_wo_h = clause_name!("run_cleaners_without_handling"); - let non_iso = clause_name!("non_iso"); + let iso_ext = clause_name!("iso_ext"); let r_w_h = self - .get_internal(r_w_h, 0, non_iso.clone()) + .get_internal(r_w_h, 0, iso_ext.clone()) .and_then(|item| item.local()); let r_wo_h = self - .get_internal(r_wo_h, 1, non_iso) + .get_internal(r_wo_h, 1, iso_ext) .and_then(|item| item.local()); if let Some(r_w_h) = r_w_h { diff --git a/src/prolog/machine/mod.rs b/src/prolog/machine/mod.rs index 6415dd4e..accccbdc 100644 --- a/src/prolog/machine/mod.rs +++ b/src/prolog/machine/mod.rs @@ -377,9 +377,9 @@ impl Machine { lib_path.clone(), ), ); - compile_user_module(&mut wam, parsing_stream(NON_ISO.as_bytes()), true, + compile_user_module(&mut wam, parsing_stream(ISO_EXT.as_bytes()), true, ListingSource::from_file_and_path( - clause_name!("non_iso"), + clause_name!("iso_ext"), lib_path.clone(), ) ); diff --git a/src/tests/builtins.pl b/src/tests/builtins.pl index 6b4c63b6..b7ba09ae 100644 --- a/src/tests/builtins.pl +++ b/src/tests/builtins.pl @@ -1,7 +1,7 @@ :- module(tests_on_builtins, []). :- use_module(library(lists)). -:- use_module(library(non_iso)). +:- use_module(library(iso_ext)). test_queries_on_builtins :- \+ atom(_), diff --git a/src/tests/call_with_inference_limit.pl b/src/tests/call_with_inference_limit.pl index c16c7291..3cafc8b7 100644 --- a/src/tests/call_with_inference_limit.pl +++ b/src/tests/call_with_inference_limit.pl @@ -1,7 +1,7 @@ :- module(tests_on_call_with_inference_limit, []). :- use_module(library(lists)). -:- use_module(library(non_iso)). +:- use_module(library(iso_ext)). :- dynamic(f/1). :- dynamic(g/1). diff --git a/src/tests/setup_call_cleanup.pl b/src/tests/setup_call_cleanup.pl index 8f15ae4b..a5869731 100644 --- a/src/tests/setup_call_cleanup.pl +++ b/src/tests/setup_call_cleanup.pl @@ -1,6 +1,6 @@ :- module(test_on_setup_call_cleanup, []). -:- use_module(library(non_iso)). +:- use_module(library(iso_ext)). test_queries_on_setup_call_cleanup :- \+ setup_call_cleanup(false, _, _), -- 2.54.0