From efe54e7c4b98a3815589f59650e78fae788b3f55 Mon Sep 17 00:00:00 2001
From: Skgland <bb-github@t-online.de>
Date: Tue, 2 Mar 2021 23:13:20 +0100
Subject: [PATCH 1/2] move to use virtual workspace

* fixes num tests from 1.51.0 aka current beta
  * cargo stabilized package-features making `--feature` and `--no-default-features`
    work as expected for virtual workspaces, though apparently not workspaces with
    a package in the root dir
---
 Cargo.toml                                    | 54 +------------------
 crates/scryer-prolog/Cargo.toml               | 51 ++++++++++++++++++
 build.rs => crates/scryer-prolog/build.rs     |  0
 .../scryer-prolog/src}/allocator.rs           |  0
 .../scryer-prolog/src}/arithmetic.rs          |  0
 .../scryer-prolog/src}/bin/scryer-prolog.rs   |  0
 .../scryer-prolog/src}/clause_types.rs        |  0
 {src => crates/scryer-prolog/src}/codegen.rs  |  0
 .../scryer-prolog/src}/debray_allocator.rs    |  0
 .../src}/examples/bimetatrans/README.md       |  0
 .../src}/examples/bimetatrans/bimetatrans.pl  |  0
 .../examples/bimetatrans/bimetatrans_tests.pl |  0
 .../scryer-prolog/src}/examples/domain.pl     |  0
 .../src}/examples/echo_server.pl              |  0
 .../src}/examples/expert_system.pl            |  0
 .../scryer-prolog/src}/examples/least_time.pl |  0
 .../scryer-prolog/src}/examples/minatotask.pl |  0
 .../scryer-prolog/src}/examples/plres.pl      |  0
 .../scryer-prolog/src}/examples/utf8.pl       |  0
 {src => crates/scryer-prolog/src}/fixtures.rs |  0
 {src => crates/scryer-prolog/src}/forms.rs    |  0
 .../scryer-prolog/src}/heap_iter.rs           |  0
 .../scryer-prolog/src}/heap_print.rs          |  0
 {src => crates/scryer-prolog/src}/indexing.rs |  0
 .../scryer-prolog/src}/instructions.rs        |  0
 .../scryer-prolog/src}/iterators.rs           |  0
 {src => crates/scryer-prolog/src}/lib.rs      |  0
 .../scryer-prolog/src}/lib/arithmetic.pl      |  0
 .../scryer-prolog/src}/lib/assoc.pl           |  0
 {src => crates/scryer-prolog/src}/lib/atts.pl |  0
 .../scryer-prolog/src}/lib/between.pl         |  0
 .../scryer-prolog/src}/lib/builtins.pl        |  0
 .../scryer-prolog/src}/lib/charsio.pl         |  0
 {src => crates/scryer-prolog/src}/lib/clpb.pl |  0
 {src => crates/scryer-prolog/src}/lib/clpz.pl |  0
 {src => crates/scryer-prolog/src}/lib/cont.pl |  0
 .../scryer-prolog/src}/lib/crypto.pl          |  0
 {src => crates/scryer-prolog/src}/lib/csv.pl  |  0
 {src => crates/scryer-prolog/src}/lib/dcgs.pl |  0
 .../scryer-prolog/src}/lib/debug.pl           |  0
 {src => crates/scryer-prolog/src}/lib/diag.pl |  0
 {src => crates/scryer-prolog/src}/lib/dif.pl  |  0
 .../scryer-prolog/src}/lib/error.pl           |  0
 .../scryer-prolog/src}/lib/files.pl           |  0
 .../scryer-prolog/src}/lib/format.pl          |  0
 .../scryer-prolog/src}/lib/freeze.pl          |  0
 .../scryer-prolog/src}/lib/gensym.pl          |  0
 .../scryer-prolog/src}/lib/http/http_open.pl  |  0
 .../src}/lib/http/http_server.pl              |  0
 .../scryer-prolog/src}/lib/iso_ext.pl         |  0
 .../scryer-prolog/src}/lib/lambda.pl          |  0
 .../scryer-prolog/src}/lib/lists.pl           |  0
 .../src}/lib/ops_and_meta_predicates.pl       |  0
 .../scryer-prolog/src}/lib/ordsets.pl         |  0
 {src => crates/scryer-prolog/src}/lib/os.pl   |  0
 .../scryer-prolog/src}/lib/pairs.pl           |  0
 {src => crates/scryer-prolog/src}/lib/pio.pl  |  0
 .../scryer-prolog/src}/lib/queues.pl          |  0
 .../scryer-prolog/src}/lib/random.pl          |  0
 {src => crates/scryer-prolog/src}/lib/reif.pl |  0
 {src => crates/scryer-prolog/src}/lib/sgml.pl |  0
 {src => crates/scryer-prolog/src}/lib/si.pl   |  0
 .../scryer-prolog/src}/lib/sockets.pl         |  0
 .../scryer-prolog/src}/lib/tabling.pl         |  0
 .../src}/lib/tabling/batched_worklist.pl      |  0
 .../src}/lib/tabling/double_linked_list.pl    |  0
 .../src}/lib/tabling/global_worklist.pl       |  0
 .../src}/lib/tabling/table_data_structure.pl  |  0
 .../src}/lib/tabling/table_link_manager.pl    |  0
 .../scryer-prolog/src}/lib/tabling/trie.pl    |  0
 .../scryer-prolog/src}/lib/tabling/wrapper.pl |  0
 .../scryer-prolog/src}/lib/terms.pl           |  0
 {src => crates/scryer-prolog/src}/lib/time.pl |  0
 {src => crates/scryer-prolog/src}/lib/uuid.pl |  0
 .../scryer-prolog/src}/lib/xpath.pl           |  0
 {src => crates/scryer-prolog/src}/loader.pl   |  0
 .../src}/machine/arithmetic_ops.rs            |  0
 .../src}/machine/attributed_variables.pl      |  0
 .../src}/machine/attributed_variables.rs      |  0
 .../scryer-prolog/src}/machine/code_repo.rs   |  0
 .../scryer-prolog/src}/machine/code_walker.rs |  0
 .../scryer-prolog/src}/machine/compile.rs     |  0
 .../scryer-prolog/src}/machine/copier.rs      |  0
 .../scryer-prolog/src}/machine/heap.rs        |  0
 .../scryer-prolog/src}/machine/load_state.rs  |  0
 .../scryer-prolog/src}/machine/loader.rs      |  0
 .../src}/machine/machine_errors.rs            |  0
 .../src}/machine/machine_indices.rs           |  0
 .../src}/machine/machine_state.rs             |  0
 .../src}/machine/machine_state_impl.rs        |  0
 .../scryer-prolog/src}/machine/mod.rs         |  0
 .../src}/machine/partial_string.rs            |  0
 .../src}/machine/preprocessor.rs              |  0
 .../src}/machine/project_attributes.pl        |  0
 .../scryer-prolog/src}/machine/raw_block.rs   |  0
 .../scryer-prolog/src}/machine/stack.rs       |  0
 .../scryer-prolog/src}/machine/streams.rs     |  0
 .../src}/machine/system_calls.rs              |  0
 .../scryer-prolog/src}/machine/term_stream.rs |  0
 {src => crates/scryer-prolog/src}/macros.rs   |  0
 {src => crates/scryer-prolog/src}/read.rs     |  0
 {src => crates/scryer-prolog/src}/targets.rs  |  0
 .../scryer-prolog/src}/tests/builtins.pl      |  0
 .../src}/tests/call_with_inference_limit.pl   |  0
 .../src}/tests/clpz/combination.pl            |  0
 .../src}/tests/clpz/permutation.pl            |  0
 .../src}/tests/clpz/test_clpz.pl              |  0
 .../scryer-prolog/src}/tests/facts.pl         |  0
 .../scryer-prolog/src}/tests/hello_world.pl   |  0
 .../scryer-prolog/src}/tests/predicates.pl    |  0
 .../scryer-prolog/src}/tests/rules.pl         |  0
 .../src}/tests/setup_call_cleanup.pl          |  0
 {src => crates/scryer-prolog/src}/toplevel.pl |  0
 {src => crates/scryer-prolog/src}/write.rs    |  0
 .../scryer-prolog/tests}/scryer.rs            |  0
 115 files changed, 52 insertions(+), 53 deletions(-)
 create mode 100644 crates/scryer-prolog/Cargo.toml
 rename build.rs => crates/scryer-prolog/build.rs (100%)
 rename {src => crates/scryer-prolog/src}/allocator.rs (100%)
 rename {src => crates/scryer-prolog/src}/arithmetic.rs (100%)
 rename {src => crates/scryer-prolog/src}/bin/scryer-prolog.rs (100%)
 rename {src => crates/scryer-prolog/src}/clause_types.rs (100%)
 rename {src => crates/scryer-prolog/src}/codegen.rs (100%)
 rename {src => crates/scryer-prolog/src}/debray_allocator.rs (100%)
 rename {src => crates/scryer-prolog/src}/examples/bimetatrans/README.md (100%)
 rename {src => crates/scryer-prolog/src}/examples/bimetatrans/bimetatrans.pl (100%)
 rename {src => crates/scryer-prolog/src}/examples/bimetatrans/bimetatrans_tests.pl (100%)
 rename {src => crates/scryer-prolog/src}/examples/domain.pl (100%)
 rename {src => crates/scryer-prolog/src}/examples/echo_server.pl (100%)
 rename {src => crates/scryer-prolog/src}/examples/expert_system.pl (100%)
 rename {src => crates/scryer-prolog/src}/examples/least_time.pl (100%)
 rename {src => crates/scryer-prolog/src}/examples/minatotask.pl (100%)
 rename {src => crates/scryer-prolog/src}/examples/plres.pl (100%)
 rename {src => crates/scryer-prolog/src}/examples/utf8.pl (100%)
 rename {src => crates/scryer-prolog/src}/fixtures.rs (100%)
 rename {src => crates/scryer-prolog/src}/forms.rs (100%)
 rename {src => crates/scryer-prolog/src}/heap_iter.rs (100%)
 rename {src => crates/scryer-prolog/src}/heap_print.rs (100%)
 rename {src => crates/scryer-prolog/src}/indexing.rs (100%)
 rename {src => crates/scryer-prolog/src}/instructions.rs (100%)
 rename {src => crates/scryer-prolog/src}/iterators.rs (100%)
 rename {src => crates/scryer-prolog/src}/lib.rs (100%)
 rename {src => crates/scryer-prolog/src}/lib/arithmetic.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/assoc.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/atts.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/between.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/builtins.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/charsio.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/clpb.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/clpz.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/cont.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/crypto.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/csv.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/dcgs.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/debug.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/diag.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/dif.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/error.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/files.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/format.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/freeze.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/gensym.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/http/http_open.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/http/http_server.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/iso_ext.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/lambda.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/lists.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/ops_and_meta_predicates.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/ordsets.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/os.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/pairs.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/pio.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/queues.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/random.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/reif.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/sgml.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/si.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/sockets.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/tabling.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/tabling/batched_worklist.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/tabling/double_linked_list.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/tabling/global_worklist.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/tabling/table_data_structure.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/tabling/table_link_manager.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/tabling/trie.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/tabling/wrapper.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/terms.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/time.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/uuid.pl (100%)
 rename {src => crates/scryer-prolog/src}/lib/xpath.pl (100%)
 rename {src => crates/scryer-prolog/src}/loader.pl (100%)
 rename {src => crates/scryer-prolog/src}/machine/arithmetic_ops.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/attributed_variables.pl (100%)
 rename {src => crates/scryer-prolog/src}/machine/attributed_variables.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/code_repo.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/code_walker.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/compile.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/copier.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/heap.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/load_state.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/loader.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/machine_errors.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/machine_indices.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/machine_state.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/machine_state_impl.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/mod.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/partial_string.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/preprocessor.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/project_attributes.pl (100%)
 rename {src => crates/scryer-prolog/src}/machine/raw_block.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/stack.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/streams.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/system_calls.rs (100%)
 rename {src => crates/scryer-prolog/src}/machine/term_stream.rs (100%)
 rename {src => crates/scryer-prolog/src}/macros.rs (100%)
 rename {src => crates/scryer-prolog/src}/read.rs (100%)
 rename {src => crates/scryer-prolog/src}/targets.rs (100%)
 rename {src => crates/scryer-prolog/src}/tests/builtins.pl (100%)
 rename {src => crates/scryer-prolog/src}/tests/call_with_inference_limit.pl (100%)
 rename {src => crates/scryer-prolog/src}/tests/clpz/combination.pl (100%)
 rename {src => crates/scryer-prolog/src}/tests/clpz/permutation.pl (100%)
 rename {src => crates/scryer-prolog/src}/tests/clpz/test_clpz.pl (100%)
 rename {src => crates/scryer-prolog/src}/tests/facts.pl (100%)
 rename {src => crates/scryer-prolog/src}/tests/hello_world.pl (100%)
 rename {src => crates/scryer-prolog/src}/tests/predicates.pl (100%)
 rename {src => crates/scryer-prolog/src}/tests/rules.pl (100%)
 rename {src => crates/scryer-prolog/src}/tests/setup_call_cleanup.pl (100%)
 rename {src => crates/scryer-prolog/src}/toplevel.pl (100%)
 rename {src => crates/scryer-prolog/src}/write.rs (100%)
 rename {tests => crates/scryer-prolog/tests}/scryer.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index da4a05612..c66a4d73c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,54 +1,2 @@
-[package]
-name = "scryer-prolog"
-version = "0.8.128"
-authors = ["Mark Thom <markjordanthom@gmail.com>"]
-edition = "2018"
-description = "A modern Prolog implementation written mostly in Rust."
-readme = "README.md"
-repository = "https://github.com/mthom/scryer-prolog"
-license = "BSD-3-Clause"
-keywords = ["prolog", "prolog-interpreter", "prolog-system"]
-categories = ["command-line-utilities"]
-build = "build.rs"
-
 [workspace]
-members = ["crates/prolog_parser", "crates/num-rug-adapter"]
-
-[build-dependencies]
-indexmap = "1.0.2"
-
-[features]
-default = ["rug", "prolog_parser/rug"]
-num = ["num-rug-adapter", "prolog_parser/num"]
-
-[dependencies]
-cpu-time = "1.0.0"
-crossterm = "0.16.0"
-dirs-next = "2.0.0"
-divrem = "0.1.0"
-downcast = "0.10.0"
-git-version = "0.3.4"
-hostname = "0.3.1"
-indexmap = "1.0.2"
-lazy_static = "1.4.0"
-libc = "0.2.62"
-nix = "0.15.0"
-num-rug-adapter = { optional = true, path = "./crates/num-rug-adapter" }
-ordered-float = "0.5.0"
-prolog_parser = { path = "./crates/prolog_parser", default-features = false }
-ref_thread_local = "0.0.0"
-rug = { version = "1.4.0", optional = true }
-rustyline = "7.0.0"
-unicode_reader = "1.0.0"
-ring = "0.16.13"
-ripemd160 = "0.8.0"
-sha3 = "0.8.2"
-blake2 = "0.8.1"
-openssl = { version = "0.10.29", features = ["vendored"] }
-native-tls = "0.2.4"
-chrono = "0.4.11"
-select = "0.4.3"
-roxmltree = "0.11.0"
-base64 = "0.12.3"
-sodiumoxide = "0.2.6"
-slice-deque = "0.3.0"
+members = ["crates/*"]
diff --git a/crates/scryer-prolog/Cargo.toml b/crates/scryer-prolog/Cargo.toml
new file mode 100644
index 000000000..db0a15068
--- /dev/null
+++ b/crates/scryer-prolog/Cargo.toml
@@ -0,0 +1,51 @@
+[package]
+name = "scryer-prolog"
+version = "0.8.128"
+authors = ["Mark Thom <markjordanthom@gmail.com>"]
+edition = "2018"
+description = "A modern Prolog implementation written mostly in Rust."
+readme = "README.md"
+repository = "https://github.com/mthom/scryer-prolog"
+license = "BSD-3-Clause"
+keywords = ["prolog", "prolog-interpreter", "prolog-system"]
+categories = ["command-line-utilities"]
+build = "build.rs"
+
+[build-dependencies]
+indexmap = "1.0.2"
+
+[features]
+default = ["rug", "prolog_parser/rug"]
+num = ["num-rug-adapter", "prolog_parser/num"]
+
+[dependencies]
+cpu-time = "1.0.0"
+crossterm = "0.16.0"
+dirs-next = "2.0.0"
+divrem = "0.1.0"
+downcast = "0.10.0"
+git-version = "0.3.4"
+hostname = "0.3.1"
+indexmap = "1.0.2"
+lazy_static = "1.4.0"
+libc = "0.2.62"
+nix = "0.15.0"
+num-rug-adapter = { optional = true, path = "../num-rug-adapter" }
+ordered-float = "0.5.0"
+prolog_parser = { path = "../prolog_parser", default-features = false }
+ref_thread_local = "0.0.0"
+rug = { version = "1.4.0", optional = true }
+rustyline = "7.0.0"
+unicode_reader = "1.0.0"
+ring = "0.16.13"
+ripemd160 = "0.8.0"
+sha3 = "0.8.2"
+blake2 = "0.8.1"
+openssl = { version = "0.10.29", features = ["vendored"] }
+native-tls = "0.2.4"
+chrono = "0.4.11"
+select = "0.4.3"
+roxmltree = "0.11.0"
+base64 = "0.12.3"
+sodiumoxide = "0.2.6"
+slice-deque = "0.3.0"
diff --git a/build.rs b/crates/scryer-prolog/build.rs
similarity index 100%
rename from build.rs
rename to crates/scryer-prolog/build.rs
diff --git a/src/allocator.rs b/crates/scryer-prolog/src/allocator.rs
similarity index 100%
rename from src/allocator.rs
rename to crates/scryer-prolog/src/allocator.rs
diff --git a/src/arithmetic.rs b/crates/scryer-prolog/src/arithmetic.rs
similarity index 100%
rename from src/arithmetic.rs
rename to crates/scryer-prolog/src/arithmetic.rs
diff --git a/src/bin/scryer-prolog.rs b/crates/scryer-prolog/src/bin/scryer-prolog.rs
similarity index 100%
rename from src/bin/scryer-prolog.rs
rename to crates/scryer-prolog/src/bin/scryer-prolog.rs
diff --git a/src/clause_types.rs b/crates/scryer-prolog/src/clause_types.rs
similarity index 100%
rename from src/clause_types.rs
rename to crates/scryer-prolog/src/clause_types.rs
diff --git a/src/codegen.rs b/crates/scryer-prolog/src/codegen.rs
similarity index 100%
rename from src/codegen.rs
rename to crates/scryer-prolog/src/codegen.rs
diff --git a/src/debray_allocator.rs b/crates/scryer-prolog/src/debray_allocator.rs
similarity index 100%
rename from src/debray_allocator.rs
rename to crates/scryer-prolog/src/debray_allocator.rs
diff --git a/src/examples/bimetatrans/README.md b/crates/scryer-prolog/src/examples/bimetatrans/README.md
similarity index 100%
rename from src/examples/bimetatrans/README.md
rename to crates/scryer-prolog/src/examples/bimetatrans/README.md
diff --git a/src/examples/bimetatrans/bimetatrans.pl b/crates/scryer-prolog/src/examples/bimetatrans/bimetatrans.pl
similarity index 100%
rename from src/examples/bimetatrans/bimetatrans.pl
rename to crates/scryer-prolog/src/examples/bimetatrans/bimetatrans.pl
diff --git a/src/examples/bimetatrans/bimetatrans_tests.pl b/crates/scryer-prolog/src/examples/bimetatrans/bimetatrans_tests.pl
similarity index 100%
rename from src/examples/bimetatrans/bimetatrans_tests.pl
rename to crates/scryer-prolog/src/examples/bimetatrans/bimetatrans_tests.pl
diff --git a/src/examples/domain.pl b/crates/scryer-prolog/src/examples/domain.pl
similarity index 100%
rename from src/examples/domain.pl
rename to crates/scryer-prolog/src/examples/domain.pl
diff --git a/src/examples/echo_server.pl b/crates/scryer-prolog/src/examples/echo_server.pl
similarity index 100%
rename from src/examples/echo_server.pl
rename to crates/scryer-prolog/src/examples/echo_server.pl
diff --git a/src/examples/expert_system.pl b/crates/scryer-prolog/src/examples/expert_system.pl
similarity index 100%
rename from src/examples/expert_system.pl
rename to crates/scryer-prolog/src/examples/expert_system.pl
diff --git a/src/examples/least_time.pl b/crates/scryer-prolog/src/examples/least_time.pl
similarity index 100%
rename from src/examples/least_time.pl
rename to crates/scryer-prolog/src/examples/least_time.pl
diff --git a/src/examples/minatotask.pl b/crates/scryer-prolog/src/examples/minatotask.pl
similarity index 100%
rename from src/examples/minatotask.pl
rename to crates/scryer-prolog/src/examples/minatotask.pl
diff --git a/src/examples/plres.pl b/crates/scryer-prolog/src/examples/plres.pl
similarity index 100%
rename from src/examples/plres.pl
rename to crates/scryer-prolog/src/examples/plres.pl
diff --git a/src/examples/utf8.pl b/crates/scryer-prolog/src/examples/utf8.pl
similarity index 100%
rename from src/examples/utf8.pl
rename to crates/scryer-prolog/src/examples/utf8.pl
diff --git a/src/fixtures.rs b/crates/scryer-prolog/src/fixtures.rs
similarity index 100%
rename from src/fixtures.rs
rename to crates/scryer-prolog/src/fixtures.rs
diff --git a/src/forms.rs b/crates/scryer-prolog/src/forms.rs
similarity index 100%
rename from src/forms.rs
rename to crates/scryer-prolog/src/forms.rs
diff --git a/src/heap_iter.rs b/crates/scryer-prolog/src/heap_iter.rs
similarity index 100%
rename from src/heap_iter.rs
rename to crates/scryer-prolog/src/heap_iter.rs
diff --git a/src/heap_print.rs b/crates/scryer-prolog/src/heap_print.rs
similarity index 100%
rename from src/heap_print.rs
rename to crates/scryer-prolog/src/heap_print.rs
diff --git a/src/indexing.rs b/crates/scryer-prolog/src/indexing.rs
similarity index 100%
rename from src/indexing.rs
rename to crates/scryer-prolog/src/indexing.rs
diff --git a/src/instructions.rs b/crates/scryer-prolog/src/instructions.rs
similarity index 100%
rename from src/instructions.rs
rename to crates/scryer-prolog/src/instructions.rs
diff --git a/src/iterators.rs b/crates/scryer-prolog/src/iterators.rs
similarity index 100%
rename from src/iterators.rs
rename to crates/scryer-prolog/src/iterators.rs
diff --git a/src/lib.rs b/crates/scryer-prolog/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to crates/scryer-prolog/src/lib.rs
diff --git a/src/lib/arithmetic.pl b/crates/scryer-prolog/src/lib/arithmetic.pl
similarity index 100%
rename from src/lib/arithmetic.pl
rename to crates/scryer-prolog/src/lib/arithmetic.pl
diff --git a/src/lib/assoc.pl b/crates/scryer-prolog/src/lib/assoc.pl
similarity index 100%
rename from src/lib/assoc.pl
rename to crates/scryer-prolog/src/lib/assoc.pl
diff --git a/src/lib/atts.pl b/crates/scryer-prolog/src/lib/atts.pl
similarity index 100%
rename from src/lib/atts.pl
rename to crates/scryer-prolog/src/lib/atts.pl
diff --git a/src/lib/between.pl b/crates/scryer-prolog/src/lib/between.pl
similarity index 100%
rename from src/lib/between.pl
rename to crates/scryer-prolog/src/lib/between.pl
diff --git a/src/lib/builtins.pl b/crates/scryer-prolog/src/lib/builtins.pl
similarity index 100%
rename from src/lib/builtins.pl
rename to crates/scryer-prolog/src/lib/builtins.pl
diff --git a/src/lib/charsio.pl b/crates/scryer-prolog/src/lib/charsio.pl
similarity index 100%
rename from src/lib/charsio.pl
rename to crates/scryer-prolog/src/lib/charsio.pl
diff --git a/src/lib/clpb.pl b/crates/scryer-prolog/src/lib/clpb.pl
similarity index 100%
rename from src/lib/clpb.pl
rename to crates/scryer-prolog/src/lib/clpb.pl
diff --git a/src/lib/clpz.pl b/crates/scryer-prolog/src/lib/clpz.pl
similarity index 100%
rename from src/lib/clpz.pl
rename to crates/scryer-prolog/src/lib/clpz.pl
diff --git a/src/lib/cont.pl b/crates/scryer-prolog/src/lib/cont.pl
similarity index 100%
rename from src/lib/cont.pl
rename to crates/scryer-prolog/src/lib/cont.pl
diff --git a/src/lib/crypto.pl b/crates/scryer-prolog/src/lib/crypto.pl
similarity index 100%
rename from src/lib/crypto.pl
rename to crates/scryer-prolog/src/lib/crypto.pl
diff --git a/src/lib/csv.pl b/crates/scryer-prolog/src/lib/csv.pl
similarity index 100%
rename from src/lib/csv.pl
rename to crates/scryer-prolog/src/lib/csv.pl
diff --git a/src/lib/dcgs.pl b/crates/scryer-prolog/src/lib/dcgs.pl
similarity index 100%
rename from src/lib/dcgs.pl
rename to crates/scryer-prolog/src/lib/dcgs.pl
diff --git a/src/lib/debug.pl b/crates/scryer-prolog/src/lib/debug.pl
similarity index 100%
rename from src/lib/debug.pl
rename to crates/scryer-prolog/src/lib/debug.pl
diff --git a/src/lib/diag.pl b/crates/scryer-prolog/src/lib/diag.pl
similarity index 100%
rename from src/lib/diag.pl
rename to crates/scryer-prolog/src/lib/diag.pl
diff --git a/src/lib/dif.pl b/crates/scryer-prolog/src/lib/dif.pl
similarity index 100%
rename from src/lib/dif.pl
rename to crates/scryer-prolog/src/lib/dif.pl
diff --git a/src/lib/error.pl b/crates/scryer-prolog/src/lib/error.pl
similarity index 100%
rename from src/lib/error.pl
rename to crates/scryer-prolog/src/lib/error.pl
diff --git a/src/lib/files.pl b/crates/scryer-prolog/src/lib/files.pl
similarity index 100%
rename from src/lib/files.pl
rename to crates/scryer-prolog/src/lib/files.pl
diff --git a/src/lib/format.pl b/crates/scryer-prolog/src/lib/format.pl
similarity index 100%
rename from src/lib/format.pl
rename to crates/scryer-prolog/src/lib/format.pl
diff --git a/src/lib/freeze.pl b/crates/scryer-prolog/src/lib/freeze.pl
similarity index 100%
rename from src/lib/freeze.pl
rename to crates/scryer-prolog/src/lib/freeze.pl
diff --git a/src/lib/gensym.pl b/crates/scryer-prolog/src/lib/gensym.pl
similarity index 100%
rename from src/lib/gensym.pl
rename to crates/scryer-prolog/src/lib/gensym.pl
diff --git a/src/lib/http/http_open.pl b/crates/scryer-prolog/src/lib/http/http_open.pl
similarity index 100%
rename from src/lib/http/http_open.pl
rename to crates/scryer-prolog/src/lib/http/http_open.pl
diff --git a/src/lib/http/http_server.pl b/crates/scryer-prolog/src/lib/http/http_server.pl
similarity index 100%
rename from src/lib/http/http_server.pl
rename to crates/scryer-prolog/src/lib/http/http_server.pl
diff --git a/src/lib/iso_ext.pl b/crates/scryer-prolog/src/lib/iso_ext.pl
similarity index 100%
rename from src/lib/iso_ext.pl
rename to crates/scryer-prolog/src/lib/iso_ext.pl
diff --git a/src/lib/lambda.pl b/crates/scryer-prolog/src/lib/lambda.pl
similarity index 100%
rename from src/lib/lambda.pl
rename to crates/scryer-prolog/src/lib/lambda.pl
diff --git a/src/lib/lists.pl b/crates/scryer-prolog/src/lib/lists.pl
similarity index 100%
rename from src/lib/lists.pl
rename to crates/scryer-prolog/src/lib/lists.pl
diff --git a/src/lib/ops_and_meta_predicates.pl b/crates/scryer-prolog/src/lib/ops_and_meta_predicates.pl
similarity index 100%
rename from src/lib/ops_and_meta_predicates.pl
rename to crates/scryer-prolog/src/lib/ops_and_meta_predicates.pl
diff --git a/src/lib/ordsets.pl b/crates/scryer-prolog/src/lib/ordsets.pl
similarity index 100%
rename from src/lib/ordsets.pl
rename to crates/scryer-prolog/src/lib/ordsets.pl
diff --git a/src/lib/os.pl b/crates/scryer-prolog/src/lib/os.pl
similarity index 100%
rename from src/lib/os.pl
rename to crates/scryer-prolog/src/lib/os.pl
diff --git a/src/lib/pairs.pl b/crates/scryer-prolog/src/lib/pairs.pl
similarity index 100%
rename from src/lib/pairs.pl
rename to crates/scryer-prolog/src/lib/pairs.pl
diff --git a/src/lib/pio.pl b/crates/scryer-prolog/src/lib/pio.pl
similarity index 100%
rename from src/lib/pio.pl
rename to crates/scryer-prolog/src/lib/pio.pl
diff --git a/src/lib/queues.pl b/crates/scryer-prolog/src/lib/queues.pl
similarity index 100%
rename from src/lib/queues.pl
rename to crates/scryer-prolog/src/lib/queues.pl
diff --git a/src/lib/random.pl b/crates/scryer-prolog/src/lib/random.pl
similarity index 100%
rename from src/lib/random.pl
rename to crates/scryer-prolog/src/lib/random.pl
diff --git a/src/lib/reif.pl b/crates/scryer-prolog/src/lib/reif.pl
similarity index 100%
rename from src/lib/reif.pl
rename to crates/scryer-prolog/src/lib/reif.pl
diff --git a/src/lib/sgml.pl b/crates/scryer-prolog/src/lib/sgml.pl
similarity index 100%
rename from src/lib/sgml.pl
rename to crates/scryer-prolog/src/lib/sgml.pl
diff --git a/src/lib/si.pl b/crates/scryer-prolog/src/lib/si.pl
similarity index 100%
rename from src/lib/si.pl
rename to crates/scryer-prolog/src/lib/si.pl
diff --git a/src/lib/sockets.pl b/crates/scryer-prolog/src/lib/sockets.pl
similarity index 100%
rename from src/lib/sockets.pl
rename to crates/scryer-prolog/src/lib/sockets.pl
diff --git a/src/lib/tabling.pl b/crates/scryer-prolog/src/lib/tabling.pl
similarity index 100%
rename from src/lib/tabling.pl
rename to crates/scryer-prolog/src/lib/tabling.pl
diff --git a/src/lib/tabling/batched_worklist.pl b/crates/scryer-prolog/src/lib/tabling/batched_worklist.pl
similarity index 100%
rename from src/lib/tabling/batched_worklist.pl
rename to crates/scryer-prolog/src/lib/tabling/batched_worklist.pl
diff --git a/src/lib/tabling/double_linked_list.pl b/crates/scryer-prolog/src/lib/tabling/double_linked_list.pl
similarity index 100%
rename from src/lib/tabling/double_linked_list.pl
rename to crates/scryer-prolog/src/lib/tabling/double_linked_list.pl
diff --git a/src/lib/tabling/global_worklist.pl b/crates/scryer-prolog/src/lib/tabling/global_worklist.pl
similarity index 100%
rename from src/lib/tabling/global_worklist.pl
rename to crates/scryer-prolog/src/lib/tabling/global_worklist.pl
diff --git a/src/lib/tabling/table_data_structure.pl b/crates/scryer-prolog/src/lib/tabling/table_data_structure.pl
similarity index 100%
rename from src/lib/tabling/table_data_structure.pl
rename to crates/scryer-prolog/src/lib/tabling/table_data_structure.pl
diff --git a/src/lib/tabling/table_link_manager.pl b/crates/scryer-prolog/src/lib/tabling/table_link_manager.pl
similarity index 100%
rename from src/lib/tabling/table_link_manager.pl
rename to crates/scryer-prolog/src/lib/tabling/table_link_manager.pl
diff --git a/src/lib/tabling/trie.pl b/crates/scryer-prolog/src/lib/tabling/trie.pl
similarity index 100%
rename from src/lib/tabling/trie.pl
rename to crates/scryer-prolog/src/lib/tabling/trie.pl
diff --git a/src/lib/tabling/wrapper.pl b/crates/scryer-prolog/src/lib/tabling/wrapper.pl
similarity index 100%
rename from src/lib/tabling/wrapper.pl
rename to crates/scryer-prolog/src/lib/tabling/wrapper.pl
diff --git a/src/lib/terms.pl b/crates/scryer-prolog/src/lib/terms.pl
similarity index 100%
rename from src/lib/terms.pl
rename to crates/scryer-prolog/src/lib/terms.pl
diff --git a/src/lib/time.pl b/crates/scryer-prolog/src/lib/time.pl
similarity index 100%
rename from src/lib/time.pl
rename to crates/scryer-prolog/src/lib/time.pl
diff --git a/src/lib/uuid.pl b/crates/scryer-prolog/src/lib/uuid.pl
similarity index 100%
rename from src/lib/uuid.pl
rename to crates/scryer-prolog/src/lib/uuid.pl
diff --git a/src/lib/xpath.pl b/crates/scryer-prolog/src/lib/xpath.pl
similarity index 100%
rename from src/lib/xpath.pl
rename to crates/scryer-prolog/src/lib/xpath.pl
diff --git a/src/loader.pl b/crates/scryer-prolog/src/loader.pl
similarity index 100%
rename from src/loader.pl
rename to crates/scryer-prolog/src/loader.pl
diff --git a/src/machine/arithmetic_ops.rs b/crates/scryer-prolog/src/machine/arithmetic_ops.rs
similarity index 100%
rename from src/machine/arithmetic_ops.rs
rename to crates/scryer-prolog/src/machine/arithmetic_ops.rs
diff --git a/src/machine/attributed_variables.pl b/crates/scryer-prolog/src/machine/attributed_variables.pl
similarity index 100%
rename from src/machine/attributed_variables.pl
rename to crates/scryer-prolog/src/machine/attributed_variables.pl
diff --git a/src/machine/attributed_variables.rs b/crates/scryer-prolog/src/machine/attributed_variables.rs
similarity index 100%
rename from src/machine/attributed_variables.rs
rename to crates/scryer-prolog/src/machine/attributed_variables.rs
diff --git a/src/machine/code_repo.rs b/crates/scryer-prolog/src/machine/code_repo.rs
similarity index 100%
rename from src/machine/code_repo.rs
rename to crates/scryer-prolog/src/machine/code_repo.rs
diff --git a/src/machine/code_walker.rs b/crates/scryer-prolog/src/machine/code_walker.rs
similarity index 100%
rename from src/machine/code_walker.rs
rename to crates/scryer-prolog/src/machine/code_walker.rs
diff --git a/src/machine/compile.rs b/crates/scryer-prolog/src/machine/compile.rs
similarity index 100%
rename from src/machine/compile.rs
rename to crates/scryer-prolog/src/machine/compile.rs
diff --git a/src/machine/copier.rs b/crates/scryer-prolog/src/machine/copier.rs
similarity index 100%
rename from src/machine/copier.rs
rename to crates/scryer-prolog/src/machine/copier.rs
diff --git a/src/machine/heap.rs b/crates/scryer-prolog/src/machine/heap.rs
similarity index 100%
rename from src/machine/heap.rs
rename to crates/scryer-prolog/src/machine/heap.rs
diff --git a/src/machine/load_state.rs b/crates/scryer-prolog/src/machine/load_state.rs
similarity index 100%
rename from src/machine/load_state.rs
rename to crates/scryer-prolog/src/machine/load_state.rs
diff --git a/src/machine/loader.rs b/crates/scryer-prolog/src/machine/loader.rs
similarity index 100%
rename from src/machine/loader.rs
rename to crates/scryer-prolog/src/machine/loader.rs
diff --git a/src/machine/machine_errors.rs b/crates/scryer-prolog/src/machine/machine_errors.rs
similarity index 100%
rename from src/machine/machine_errors.rs
rename to crates/scryer-prolog/src/machine/machine_errors.rs
diff --git a/src/machine/machine_indices.rs b/crates/scryer-prolog/src/machine/machine_indices.rs
similarity index 100%
rename from src/machine/machine_indices.rs
rename to crates/scryer-prolog/src/machine/machine_indices.rs
diff --git a/src/machine/machine_state.rs b/crates/scryer-prolog/src/machine/machine_state.rs
similarity index 100%
rename from src/machine/machine_state.rs
rename to crates/scryer-prolog/src/machine/machine_state.rs
diff --git a/src/machine/machine_state_impl.rs b/crates/scryer-prolog/src/machine/machine_state_impl.rs
similarity index 100%
rename from src/machine/machine_state_impl.rs
rename to crates/scryer-prolog/src/machine/machine_state_impl.rs
diff --git a/src/machine/mod.rs b/crates/scryer-prolog/src/machine/mod.rs
similarity index 100%
rename from src/machine/mod.rs
rename to crates/scryer-prolog/src/machine/mod.rs
diff --git a/src/machine/partial_string.rs b/crates/scryer-prolog/src/machine/partial_string.rs
similarity index 100%
rename from src/machine/partial_string.rs
rename to crates/scryer-prolog/src/machine/partial_string.rs
diff --git a/src/machine/preprocessor.rs b/crates/scryer-prolog/src/machine/preprocessor.rs
similarity index 100%
rename from src/machine/preprocessor.rs
rename to crates/scryer-prolog/src/machine/preprocessor.rs
diff --git a/src/machine/project_attributes.pl b/crates/scryer-prolog/src/machine/project_attributes.pl
similarity index 100%
rename from src/machine/project_attributes.pl
rename to crates/scryer-prolog/src/machine/project_attributes.pl
diff --git a/src/machine/raw_block.rs b/crates/scryer-prolog/src/machine/raw_block.rs
similarity index 100%
rename from src/machine/raw_block.rs
rename to crates/scryer-prolog/src/machine/raw_block.rs
diff --git a/src/machine/stack.rs b/crates/scryer-prolog/src/machine/stack.rs
similarity index 100%
rename from src/machine/stack.rs
rename to crates/scryer-prolog/src/machine/stack.rs
diff --git a/src/machine/streams.rs b/crates/scryer-prolog/src/machine/streams.rs
similarity index 100%
rename from src/machine/streams.rs
rename to crates/scryer-prolog/src/machine/streams.rs
diff --git a/src/machine/system_calls.rs b/crates/scryer-prolog/src/machine/system_calls.rs
similarity index 100%
rename from src/machine/system_calls.rs
rename to crates/scryer-prolog/src/machine/system_calls.rs
diff --git a/src/machine/term_stream.rs b/crates/scryer-prolog/src/machine/term_stream.rs
similarity index 100%
rename from src/machine/term_stream.rs
rename to crates/scryer-prolog/src/machine/term_stream.rs
diff --git a/src/macros.rs b/crates/scryer-prolog/src/macros.rs
similarity index 100%
rename from src/macros.rs
rename to crates/scryer-prolog/src/macros.rs
diff --git a/src/read.rs b/crates/scryer-prolog/src/read.rs
similarity index 100%
rename from src/read.rs
rename to crates/scryer-prolog/src/read.rs
diff --git a/src/targets.rs b/crates/scryer-prolog/src/targets.rs
similarity index 100%
rename from src/targets.rs
rename to crates/scryer-prolog/src/targets.rs
diff --git a/src/tests/builtins.pl b/crates/scryer-prolog/src/tests/builtins.pl
similarity index 100%
rename from src/tests/builtins.pl
rename to crates/scryer-prolog/src/tests/builtins.pl
diff --git a/src/tests/call_with_inference_limit.pl b/crates/scryer-prolog/src/tests/call_with_inference_limit.pl
similarity index 100%
rename from src/tests/call_with_inference_limit.pl
rename to crates/scryer-prolog/src/tests/call_with_inference_limit.pl
diff --git a/src/tests/clpz/combination.pl b/crates/scryer-prolog/src/tests/clpz/combination.pl
similarity index 100%
rename from src/tests/clpz/combination.pl
rename to crates/scryer-prolog/src/tests/clpz/combination.pl
diff --git a/src/tests/clpz/permutation.pl b/crates/scryer-prolog/src/tests/clpz/permutation.pl
similarity index 100%
rename from src/tests/clpz/permutation.pl
rename to crates/scryer-prolog/src/tests/clpz/permutation.pl
diff --git a/src/tests/clpz/test_clpz.pl b/crates/scryer-prolog/src/tests/clpz/test_clpz.pl
similarity index 100%
rename from src/tests/clpz/test_clpz.pl
rename to crates/scryer-prolog/src/tests/clpz/test_clpz.pl
diff --git a/src/tests/facts.pl b/crates/scryer-prolog/src/tests/facts.pl
similarity index 100%
rename from src/tests/facts.pl
rename to crates/scryer-prolog/src/tests/facts.pl
diff --git a/src/tests/hello_world.pl b/crates/scryer-prolog/src/tests/hello_world.pl
similarity index 100%
rename from src/tests/hello_world.pl
rename to crates/scryer-prolog/src/tests/hello_world.pl
diff --git a/src/tests/predicates.pl b/crates/scryer-prolog/src/tests/predicates.pl
similarity index 100%
rename from src/tests/predicates.pl
rename to crates/scryer-prolog/src/tests/predicates.pl
diff --git a/src/tests/rules.pl b/crates/scryer-prolog/src/tests/rules.pl
similarity index 100%
rename from src/tests/rules.pl
rename to crates/scryer-prolog/src/tests/rules.pl
diff --git a/src/tests/setup_call_cleanup.pl b/crates/scryer-prolog/src/tests/setup_call_cleanup.pl
similarity index 100%
rename from src/tests/setup_call_cleanup.pl
rename to crates/scryer-prolog/src/tests/setup_call_cleanup.pl
diff --git a/src/toplevel.pl b/crates/scryer-prolog/src/toplevel.pl
similarity index 100%
rename from src/toplevel.pl
rename to crates/scryer-prolog/src/toplevel.pl
diff --git a/src/write.rs b/crates/scryer-prolog/src/write.rs
similarity index 100%
rename from src/write.rs
rename to crates/scryer-prolog/src/write.rs
diff --git a/tests/scryer.rs b/crates/scryer-prolog/tests/scryer.rs
similarity index 100%
rename from tests/scryer.rs
rename to crates/scryer-prolog/tests/scryer.rs

From ca92066f11c39c64be70a8c299cae1ab1bcc2c23 Mon Sep 17 00:00:00 2001
From: Skgland <bb-github@t-online.de>
Date: Tue, 2 Mar 2021 23:18:52 +0100
Subject: [PATCH 2/2] adjust ci

---
 .github/workflows/test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ddb8e61d7..aac60e974 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,12 +21,12 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: rustc
-          args: --verbose --lib -- -D warnings
+          args: --verbose -p scryer-prolog --lib -- -D warnings
       - name: Build bin
         uses: actions-rs/cargo@v1
         with:
           command: rustc
-          args: --verbose --bin scryer-prolog -- -D warnings
+          args: --verbose -p scryer-prolog --bin scryer-prolog -- -D warnings
       - name: Test
         uses: actions-rs/cargo@v1
         with: