From a239007db06fbc25adbdc4ec7595397223e02144 Mon Sep 17 00:00:00 2001 From: Mark Thom Date: Sat, 30 Jan 2021 22:03:07 -0700 Subject: [PATCH] target prolog_parser_rebis on crates.io --- Cargo.lock | 6 ++++-- Cargo.toml | 6 +++--- src/allocator.rs | 2 +- src/arithmetic.rs | 2 +- src/clause_types.rs | 2 +- src/codegen.rs | 4 ++-- src/debray_allocator.rs | 2 +- src/fixtures.rs | 2 +- src/forms.rs | 4 ++-- src/heap_print.rs | 2 +- src/indexing.rs | 4 ++-- src/instructions.rs | 2 +- src/iterators.rs | 2 +- src/machine/arithmetic_ops.rs | 2 +- src/machine/heap.rs | 2 +- src/machine/loader.rs | 2 +- src/machine/machine_errors.rs | 2 +- src/machine/machine_indices.rs | 2 +- src/machine/machine_state.rs | 4 ++-- src/machine/machine_state_impl.rs | 4 ++-- src/machine/mod.rs | 4 ++-- src/machine/preprocessor.rs | 4 ++-- src/machine/streams.rs | 2 +- src/machine/system_calls.rs | 6 +++--- src/machine/term_stream.rs | 4 ++-- src/main.rs | 2 +- src/read.rs | 6 +++--- src/targets.rs | 2 +- 28 files changed, 45 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b9f316ba..c54283f8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -878,8 +878,10 @@ dependencies = [ ] [[package]] -name = "prolog_parser" +name = "prolog_parser_rebis" version = "0.8.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52213fbb212208bf9e80c6d34bbfeb9ebef4dca28462f034e195e073e79c334" dependencies = [ "lexical", "num-rug-adapter", @@ -1221,7 +1223,7 @@ dependencies = [ "num-rug-adapter", "openssl", "ordered-float", - "prolog_parser", + "prolog_parser_rebis", "ref_thread_local", "ring", "ripemd160", diff --git a/Cargo.toml b/Cargo.toml index cf1d85e3..93caf8ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,8 +15,8 @@ build = "build.rs" indexmap = "1.0.2" [features] -default = ["rug", "prolog_parser/rug"] -num = ["num-rug-adapter", "prolog_parser/num"] +default = ["rug", "prolog_parser_rebis/rug"] +num = ["num-rug-adapter", "prolog_parser_rebis/num"] [dependencies] cpu-time = "1.0.0" @@ -32,7 +32,7 @@ libc = "0.2.62" nix = "0.15.0" num-rug-adapter = { optional = true, version = "0.1.4" } ordered-float = "0.5.0" -prolog_parser = { version = "0.8.63", path = "../prolog_parser", default-features = false } +prolog_parser_rebis = { version = "0.8.68", default-features = false } ref_thread_local = "0.0.0" rug = { version = "1.4.0", optional = true } rustyline = "7.0.0" diff --git a/src/allocator.rs b/src/allocator.rs index 9034efc5..f2b2cd0c 100644 --- a/src/allocator.rs +++ b/src/allocator.rs @@ -1,4 +1,4 @@ -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::fixtures::*; use crate::forms::*; diff --git a/src/arithmetic.rs b/src/arithmetic.rs index c4cefafe..1231dfa6 100644 --- a/src/arithmetic.rs +++ b/src/arithmetic.rs @@ -1,4 +1,4 @@ -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::clause_types::*; use crate::fixtures::*; diff --git a/src/clause_types.rs b/src/clause_types.rs index a0318d8d..91f6447e 100644 --- a/src/clause_types.rs +++ b/src/clause_types.rs @@ -1,4 +1,4 @@ -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::forms::Number; use crate::machine::machine_indices::*; diff --git a/src/codegen.rs b/src/codegen.rs index 1f349246..f2a1c5ab 100644 --- a/src/codegen.rs +++ b/src/codegen.rs @@ -1,6 +1,6 @@ /// Code generation to WAM-like instructions. -use crate::prolog_parser::ast::*; -use crate::prolog_parser::tabled_rc::TabledData; +use crate::prolog_parser_rebis::ast::*; +use crate::prolog_parser_rebis::tabled_rc::TabledData; use crate::allocator::*; use crate::arithmetic::*; diff --git a/src/debray_allocator.rs b/src/debray_allocator.rs index 9e129828..3c69bda2 100644 --- a/src/debray_allocator.rs +++ b/src/debray_allocator.rs @@ -1,6 +1,6 @@ use crate::indexmap::IndexMap; -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::allocator::*; use crate::fixtures::*; diff --git a/src/fixtures.rs b/src/fixtures.rs index 907c9227..d9034562 100644 --- a/src/fixtures.rs +++ b/src/fixtures.rs @@ -1,4 +1,4 @@ -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::forms::*; use crate::instructions::*; diff --git a/src/forms.rs b/src/forms.rs index 006371eb..2a4f5d7d 100644 --- a/src/forms.rs +++ b/src/forms.rs @@ -1,5 +1,5 @@ -use crate::prolog_parser::ast::*; -use crate::prolog_parser::parser::OpDesc; +use crate::prolog_parser_rebis::ast::*; +use crate::prolog_parser_rebis::parser::OpDesc; use crate::clause_types::*; use crate::machine::machine_errors::*; diff --git a/src/heap_print.rs b/src/heap_print.rs index e4792969..29530fa5 100644 --- a/src/heap_print.rs +++ b/src/heap_print.rs @@ -1,4 +1,4 @@ -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::clause_types::*; use crate::forms::*; diff --git a/src/indexing.rs b/src/indexing.rs index f2029a31..8a231514 100644 --- a/src/indexing.rs +++ b/src/indexing.rs @@ -1,5 +1,5 @@ -use crate::prolog_parser::ast::*; -use crate::prolog_parser::tabled_rc::*; +use crate::prolog_parser_rebis::ast::*; +use crate::prolog_parser_rebis::tabled_rc::*; use crate::forms::*; use crate::instructions::*; diff --git a/src/instructions.rs b/src/instructions.rs index a913f49e..d27d120a 100644 --- a/src/instructions.rs +++ b/src/instructions.rs @@ -1,4 +1,4 @@ -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::clause_types::*; use crate::forms::*; diff --git a/src/iterators.rs b/src/iterators.rs index 9c549166..a3b5956b 100644 --- a/src/iterators.rs +++ b/src/iterators.rs @@ -1,4 +1,4 @@ -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::clause_types::*; use crate::forms::*; diff --git a/src/machine/arithmetic_ops.rs b/src/machine/arithmetic_ops.rs index 110353ac..0c8fb8ff 100644 --- a/src/machine/arithmetic_ops.rs +++ b/src/machine/arithmetic_ops.rs @@ -1,6 +1,6 @@ use crate::divrem::*; -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::arithmetic::*; use crate::clause_types::*; diff --git a/src/machine/heap.rs b/src/machine/heap.rs index 612742c9..0d3a5cf6 100644 --- a/src/machine/heap.rs +++ b/src/machine/heap.rs @@ -1,6 +1,6 @@ use core::marker::PhantomData; -use crate::prolog_parser::ast::Constant; +use crate::prolog_parser_rebis::ast::Constant; use crate::machine::machine_indices::*; use crate::machine::partial_string::*; diff --git a/src/machine/loader.rs b/src/machine/loader.rs index a6704894..ce6e4fc0 100644 --- a/src/machine/loader.rs +++ b/src/machine/loader.rs @@ -1,4 +1,4 @@ -use prolog_parser::ast::*; +use prolog_parser_rebis::ast::*; use crate::forms::*; use crate::indexing::*; diff --git a/src/machine/machine_errors.rs b/src/machine/machine_errors.rs index dcea8448..ffb95aef 100644 --- a/src/machine/machine_errors.rs +++ b/src/machine/machine_errors.rs @@ -1,4 +1,4 @@ -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::forms::{ModuleSource, Number}; //, PredicateKey}; use crate::machine::heap::*; diff --git a/src/machine/machine_indices.rs b/src/machine/machine_indices.rs index 14489b76..21effa5d 100644 --- a/src/machine/machine_indices.rs +++ b/src/machine/machine_indices.rs @@ -1,4 +1,4 @@ -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::clause_types::*; use crate::fixtures::*; diff --git a/src/machine/machine_state.rs b/src/machine/machine_state.rs index ab04a532..a49465ec 100644 --- a/src/machine/machine_state.rs +++ b/src/machine/machine_state.rs @@ -1,5 +1,5 @@ -use crate::prolog_parser::ast::*; -use crate::prolog_parser::tabled_rc::*; +use crate::prolog_parser_rebis::ast::*; +use crate::prolog_parser_rebis::tabled_rc::*; use crate::clause_types::*; use crate::forms::*; diff --git a/src/machine/machine_state_impl.rs b/src/machine/machine_state_impl.rs index a387970e..277caa08 100644 --- a/src/machine/machine_state_impl.rs +++ b/src/machine/machine_state_impl.rs @@ -1,5 +1,5 @@ -use crate::prolog_parser::ast::*; -use crate::prolog_parser::tabled_rc::*; +use crate::prolog_parser_rebis::ast::*; +use crate::prolog_parser_rebis::tabled_rc::*; use crate::clause_types::*; use crate::forms::*; diff --git a/src/machine/mod.rs b/src/machine/mod.rs index f8d661a2..9fc72720 100644 --- a/src/machine/mod.rs +++ b/src/machine/mod.rs @@ -1,5 +1,5 @@ -use crate::prolog_parser::ast::*; -use crate::prolog_parser::tabled_rc::*; +use crate::prolog_parser_rebis::ast::*; +use crate::prolog_parser_rebis::tabled_rc::*; use crate::clause_types::*; use crate::forms::*; diff --git a/src/machine/preprocessor.rs b/src/machine/preprocessor.rs index 7054796a..1f5de851 100644 --- a/src/machine/preprocessor.rs +++ b/src/machine/preprocessor.rs @@ -1,5 +1,5 @@ -use crate::prolog_parser::ast::*; -use crate::prolog_parser::tabled_rc::*; +use crate::prolog_parser_rebis::ast::*; +use crate::prolog_parser_rebis::tabled_rc::*; use crate::forms::*; use crate::iterators::*; diff --git a/src/machine/streams.rs b/src/machine/streams.rs index 644e6ee7..21040c60 100644 --- a/src/machine/streams.rs +++ b/src/machine/streams.rs @@ -1,4 +1,4 @@ -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::read::PrologStream; use crate::read::readline::*; diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs index 0623df76..2ed49409 100644 --- a/src/machine/system_calls.rs +++ b/src/machine/system_calls.rs @@ -1,6 +1,6 @@ -use crate::prolog_parser::ast::*; -use crate::prolog_parser::parser::*; -use crate::prolog_parser::tabled_rc::*; +use crate::prolog_parser_rebis::ast::*; +use crate::prolog_parser_rebis::parser::*; +use crate::prolog_parser_rebis::tabled_rc::*; use crate::clause_types::*; use crate::forms::*; diff --git a/src/machine/term_stream.rs b/src/machine/term_stream.rs index bceec683..e408a6f1 100644 --- a/src/machine/term_stream.rs +++ b/src/machine/term_stream.rs @@ -1,5 +1,5 @@ -use crate::prolog_parser::ast::*; -use crate::prolog_parser::parser::*; +use crate::prolog_parser_rebis::ast::*; +use crate::prolog_parser_rebis::parser::*; use crate::machine::*; use crate::machine::machine_errors::CompilationError; diff --git a/src/main.rs b/src/main.rs index 2495257e..07684b61 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,7 +16,7 @@ extern crate nix; extern crate openssl; extern crate ordered_float; #[macro_use] -extern crate prolog_parser; +extern crate prolog_parser_rebis; #[macro_use] extern crate ref_thread_local; extern crate ring; diff --git a/src/read.rs b/src/read.rs index f240ab28..ba975201 100644 --- a/src/read.rs +++ b/src/read.rs @@ -1,6 +1,6 @@ -use crate::prolog_parser::ast::*; -use crate::prolog_parser::parser::*; -use crate::prolog_parser::tabled_rc::TabledData; +use crate::prolog_parser_rebis::ast::*; +use crate::prolog_parser_rebis::parser::*; +use crate::prolog_parser_rebis::tabled_rc::TabledData; use crate::forms::*; use crate::iterators::*; diff --git a/src/targets.rs b/src/targets.rs index 643ea1d5..a75d3f79 100644 --- a/src/targets.rs +++ b/src/targets.rs @@ -1,4 +1,4 @@ -use crate::prolog_parser::ast::*; +use crate::prolog_parser_rebis::ast::*; use crate::clause_types::*; use crate::forms::*; -- 2.54.0