rename `prolog_parser_rebis` to `prolog_parser`

also remove remaining extern crate statements that slipped through earlier

diff --git a/Cargo.lock b/Cargo.lock
index ef3f28a06429ea1ef3eb77151ec636b77bb940bb..43771e591a1fad522fb979bed7aae99a2772e832 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -878,7 +878,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "prolog_parser_rebis"
+name = "prolog_parser"
 version = "0.8.68"
 dependencies = [
  "lexical",
@@ -1221,7 +1221,7 @@ dependencies = [
  "num-rug-adapter",
  "openssl",
  "ordered-float",
- "prolog_parser_rebis",
+ "prolog_parser",
  "ref_thread_local",
  "ring",
  "ripemd160",

diff --git a/Cargo.toml b/Cargo.toml
index c49eebcfb797cba25dcfff5a35eb3b5c41aedf6e..708125ec013fb2a2b6ea533279d3871e4528abb8 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -18,8 +18,8 @@ members = ["crates/prolog_parser"]
 indexmap = "1.0.2"
 
 [features]
-default = ["rug", "prolog_parser_rebis/rug"]
-num = ["num-rug-adapter", "prolog_parser_rebis/num"]
+default = ["rug", "prolog_parser/rug"]
+num = ["num-rug-adapter", "prolog_parser/num"]
 
 [dependencies]
 cpu-time = "1.0.0"
@@ -35,7 +35,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_rebis = { path = "./crates/prolog_parser", default-features = false }
+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"

diff --git a/build.rs b/build.rs
index 3cd4421d16a2b20368cbb7616d981ceb59ae0327..c0865b523ae7b821706f09c1c567aec7cfc0b74c 100644 (file)
--- a/build.rs
+++ b/build.rs
@@ -1,5 +1,3 @@
-extern crate indexmap;
-
 use std::env;
 use std::fs;
 use std::fs::File;

diff --git a/crates/prolog_parser/Cargo.lock b/crates/prolog_parser/Cargo.lock
index f90f0d698e56c8de515e2fe632fc818737d73615..57d62880ee490f55160bcb161d0328a2a837b401 100644 (file)
--- a/crates/prolog_parser/Cargo.lock
+++ b/crates/prolog_parser/Cargo.lock
@@ -148,7 +148,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "prolog_parser_rebis"
+name = "prolog_parser"
 version = "0.8.68"
 dependencies = [
  "lexical",

diff --git a/crates/prolog_parser/Cargo.toml b/crates/prolog_parser/Cargo.toml
index 83114a6e21698b9b72bba7567759e335d89cf7a5..17f0c27f3157abbd1ebd483828f1dea113bc79fc 100644 (file)
--- a/crates/prolog_parser/Cargo.toml
+++ b/crates/prolog_parser/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "prolog_parser_rebis"
+name = "prolog_parser"
 version = "0.8.68"
 authors = ["Mark Thom <[email protected]>"]
 edition = "2018"

diff --git a/crates/prolog_parser/tests/bom.rs b/crates/prolog_parser/tests/bom.rs
index 25b571047bbbd6dfaf1c1c1063bebf5ab80a586d..8a92c1276e4a92957a4d479956ee9dd8998a95c6 100644 (file)
--- a/crates/prolog_parser/tests/bom.rs
+++ b/crates/prolog_parser/tests/bom.rs
@@ -1,8 +1,6 @@
-extern crate prolog_parser_rebis;
-
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::lexer::{Lexer, Token};
-use prolog_parser_rebis::tabled_rc::TabledData;
+use prolog_parser::ast::*;
+use prolog_parser::lexer::{Lexer, Token};
+use prolog_parser::tabled_rc::TabledData;
 
 use std::rc::Rc;
 
@@ -27,7 +25,7 @@ fn skip_utf8_bom() {
     let mut lexer = Lexer::new(atom_tbl, flags, &mut stream);
     match lexer.next_token() {
         Ok(Token::Constant(Constant::Fixnum(4))) => (),
-        _ => assert!(false)
+        _ => assert!(false),
     }
 }
 
@@ -37,7 +35,6 @@ fn invalid_utf16_bom() {
     let stream = parsing_stream(bytes);
     match stream {
         Err(ParserError::Utf8Error(0, 0)) => (),
-        _ => assert!(false)
+        _ => assert!(false),
     }
 }
-

diff --git a/crates/prolog_parser/tests/parse_tokens.rs b/crates/prolog_parser/tests/parse_tokens.rs
index 3afb9164432d4b6fe615521b675af260d072599d..69b632865dc8fae924a8e149740366276850eef6 100644 (file)
--- a/crates/prolog_parser/tests/parse_tokens.rs
+++ b/crates/prolog_parser/tests/parse_tokens.rs
@@ -1,8 +1,6 @@
-extern crate prolog_parser_rebis;
-
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::lexer::{Lexer, Token};
-use prolog_parser_rebis::tabled_rc::TabledData;
+use prolog_parser::ast::*;
+use prolog_parser::lexer::{Lexer, Token};
+use prolog_parser::tabled_rc::TabledData;
 
 use std::rc::Rc;
 

diff --git a/src/allocator.rs b/src/allocator.rs
index 8d447fb13a7adfcc09f84a721fde1b7a93a9a5cd..73d281cdea227c7a664c31269cb43b6a9d5a98ac 100644 (file)
--- a/src/allocator.rs
+++ b/src/allocator.rs
@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::temp_v;
+use prolog_parser::ast::*;
+use prolog_parser::temp_v;
 
 use crate::fixtures::*;
 use crate::forms::*;

diff --git a/src/arithmetic.rs b/src/arithmetic.rs
index 68f9f483f99dde007329421f0786f3d437b141da..7941ed3bbd3b80fb01f9faba153ac0d332bd69fc 100644 (file)
--- a/src/arithmetic.rs
+++ b/src/arithmetic.rs
@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::{atom, clause_name};
+use prolog_parser::ast::*;
+use prolog_parser::{atom, clause_name};
 
 use crate::clause_types::*;
 use crate::fixtures::*;

diff --git a/src/clause_types.rs b/src/clause_types.rs
index 5096ffad3f08e9f6036ddad6be38b6a3626f56e5..a3fa0ee833b0013b29efc0d111465755359f9d1e 100644 (file)
--- a/src/clause_types.rs
+++ b/src/clause_types.rs
@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::{clause_name, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::{clause_name, temp_v};
 
 use crate::forms::Number;
 use crate::machine::machine_indices::*;

diff --git a/src/codegen.rs b/src/codegen.rs
index 41bd72c6006223ef64b5666230e8a065ee4b4e63..cb9c4a97ef7964b6dfff1339feedaeb55647957f 100644 (file)
--- a/src/codegen.rs
+++ b/src/codegen.rs
@@ -1,7 +1,7 @@
 /// Code generation to WAM-like instructions.
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::tabled_rc::TabledData;
-use prolog_parser_rebis::{perm_v, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::tabled_rc::TabledData;
+use prolog_parser::{perm_v, temp_v};
 
 use crate::allocator::*;
 use crate::arithmetic::*;

diff --git a/src/debray_allocator.rs b/src/debray_allocator.rs
index ed0b9704c968550eed7c56f28e38845e412c83cb..4d69a344b65b25b426516927162253f7dff5b22c 100644 (file)
--- a/src/debray_allocator.rs
+++ b/src/debray_allocator.rs
@@ -1,7 +1,7 @@
 use indexmap::IndexMap;
 
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::temp_v;
+use prolog_parser::ast::*;
+use prolog_parser::temp_v;
 
 use crate::allocator::*;
 use crate::fixtures::*;

diff --git a/src/fixtures.rs b/src/fixtures.rs
index 002774de36e2dce78c772cc7a9bb96199c3b7216..94d10c259d7ab2ef665127a7d6ded2363c30325c 100644 (file)
--- a/src/fixtures.rs
+++ b/src/fixtures.rs
@@ -1,4 +1,4 @@
-use prolog_parser_rebis::ast::*;
+use prolog_parser::ast::*;
 
 use crate::forms::*;
 use crate::instructions::*;

diff --git a/src/forms.rs b/src/forms.rs
index 5dfc680d0971d91986e40f64e7e328a1d338ff00..110906017eba419e0820b08860636fe36ae4f465 100644 (file)
--- a/src/forms.rs
+++ b/src/forms.rs
@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::parser::OpDesc;
-use prolog_parser_rebis::{clause_name, is_infix, is_postfix};
+use prolog_parser::ast::*;
+use prolog_parser::parser::OpDesc;
+use prolog_parser::{clause_name, is_infix, is_postfix};
 
 use crate::clause_types::*;
 use crate::machine::machine_errors::*;

diff --git a/src/heap_print.rs b/src/heap_print.rs
index a4c1354ad0bf23f055464de7462926bcd150056f..aadd2e0f848a0456e186bc8c0b4389476f5232b8 100644 (file)
--- a/src/heap_print.rs
+++ b/src/heap_print.rs
@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::{
+use prolog_parser::ast::*;
+use prolog_parser::{
     alpha_numeric_char, capital_letter_char, clause_name, cut_char, decimal_digit_char,
     graphic_token_char, is_fx, is_infix, is_postfix, is_prefix, is_xf, is_xfx, is_xfy, is_yfx,
     semicolon_char, sign_char, single_quote_char, small_letter_char, solo_char,

diff --git a/src/indexing.rs b/src/indexing.rs
index 1b14f3014bba683be4844695180544ebbc0439d8..16f0ce3319a2501f1878eefde22a58faacf03c9f 100644 (file)
--- a/src/indexing.rs
+++ b/src/indexing.rs
@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::clause_name;
-use prolog_parser_rebis::tabled_rc::*;
+use prolog_parser::ast::*;
+use prolog_parser::clause_name;
+use prolog_parser::tabled_rc::*;
 
 use crate::forms::*;
 use crate::instructions::*;

diff --git a/src/instructions.rs b/src/instructions.rs
index 585cd2cbfa110cb06f5d871ca6a193dfa60deb8f..98002bceb6b68a68c938aa2f33747da27f78da84 100644 (file)
--- a/src/instructions.rs
+++ b/src/instructions.rs
@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::clause_name;
+use prolog_parser::ast::*;
+use prolog_parser::clause_name;
 
 use crate::clause_types::*;
 use crate::forms::*;

diff --git a/src/iterators.rs b/src/iterators.rs
index beb81ca4ac15499914309cbe2d9914a0bfb1af74..fc4fbdc3da7a2e519577318643aec08517eafe90 100644 (file)
--- a/src/iterators.rs
+++ b/src/iterators.rs
@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::rc_atom;
+use prolog_parser::ast::*;
+use prolog_parser::rc_atom;
 
 use crate::clause_types::*;
 use crate::forms::*;

diff --git a/src/machine/arithmetic_ops.rs b/src/machine/arithmetic_ops.rs
index b21cb7a9a012460b5502b91f5ef67e0c9b39e755..63ec2d6d861ee777834bc1dcbf532c45277114d1 100644 (file)
--- a/src/machine/arithmetic_ops.rs
+++ b/src/machine/arithmetic_ops.rs
@@ -1,7 +1,7 @@
 use divrem::*;
 
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::clause_name;
+use prolog_parser::ast::*;
+use prolog_parser::clause_name;
 
 use crate::arithmetic::*;
 use crate::clause_types::*;

diff --git a/src/machine/attributed_variables.rs b/src/machine/attributed_variables.rs
index 4bc90fc4875e2698aae5468696cd9009ac685849..aee385f093f01735db8e75fc533ba360062d4d44 100644 (file)
--- a/src/machine/attributed_variables.rs
+++ b/src/machine/attributed_variables.rs
@@ -1,6 +1,6 @@
 use crate::heap_iter::*;
 use crate::machine::*;
-use prolog_parser_rebis::temp_v;
+use prolog_parser::temp_v;
 
 use indexmap::IndexSet;
 

diff --git a/src/machine/compile.rs b/src/machine/compile.rs
index 1ab52a73b558289d958a03805f7272a65971b4e2..af25b3e8930e1c630e2a54dd0fad7a0fe1587aa9 100644 (file)
--- a/src/machine/compile.rs
+++ b/src/machine/compile.rs
@@ -1,4 +1,4 @@
-use prolog_parser_rebis::clause_name;
+use prolog_parser::clause_name;
 
 use crate::codegen::*;
 use crate::debray_allocator::*;

diff --git a/src/machine/heap.rs b/src/machine/heap.rs
index c611566200010ed0b05e5cf8c118eef53d6aa505..7f9323c119ac01c03a92d10bbef6b8f1c1d7ee1d 100644 (file)
--- a/src/machine/heap.rs
+++ b/src/machine/heap.rs
@@ -1,6 +1,6 @@
 use core::marker::PhantomData;
 
-use prolog_parser_rebis::ast::Constant;
+use prolog_parser::ast::Constant;
 
 use crate::machine::machine_indices::*;
 use crate::machine::partial_string::*;

diff --git a/src/machine/load_state.rs b/src/machine/load_state.rs
index 5ddd2c9fd09b625966d4427c2553aa756c2dd401..ebca8518fc91eb63532027aa407ec6a40eeac25f 100644 (file)
--- a/src/machine/load_state.rs
+++ b/src/machine/load_state.rs
@@ -1,6 +1,6 @@
 use crate::machine::machine_indices::*;
 use crate::machine::*;
-use prolog_parser_rebis::clause_name;
+use prolog_parser::clause_name;
 
 use crate::machine::term_stream::*;
 use indexmap::IndexSet;

diff --git a/src/machine/loader.rs b/src/machine/loader.rs
index 040e478c68116dd644f038f668834bbf2df4d844..91d41c7fbd22565ebdc0ec782e7cd163f96c5ea7 100644 (file)
--- a/src/machine/loader.rs
+++ b/src/machine/loader.rs
@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::{clause_name, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::{clause_name, temp_v};
 
 use crate::forms::*;
 use crate::indexing::*;

diff --git a/src/machine/machine_errors.rs b/src/machine/machine_errors.rs
index b1d60bb35c759ab8f2f61a602514d6bc82cef9d8..eab527703813d4712936b019db74a29b09f477b4 100644 (file)
--- a/src/machine/machine_errors.rs
+++ b/src/machine/machine_errors.rs
@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::{clause_name, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::{clause_name, temp_v};
 
 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 918af24ceae9859032244b4fac374258f6545206..6bb9dffdd861aceef711e4b868f7b191194281be 100644 (file)
--- a/src/machine/machine_indices.rs
+++ b/src/machine/machine_indices.rs
@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::clause_name;
+use prolog_parser::ast::*;
+use prolog_parser::clause_name;
 
 use crate::clause_types::*;
 use crate::fixtures::*;

diff --git a/src/machine/machine_state.rs b/src/machine/machine_state.rs
index f716013460f03a0fcddaa8fa205e8bce38c948ca..6fedf6bbf8333781c18ea8cb815057afc77cf6fe 100644 (file)
--- a/src/machine/machine_state.rs
+++ b/src/machine/machine_state.rs
@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::tabled_rc::*;
-use prolog_parser_rebis::{clause_name, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::tabled_rc::*;
+use prolog_parser::{clause_name, temp_v};
 
 use crate::clause_types::*;
 use crate::forms::*;

diff --git a/src/machine/machine_state_impl.rs b/src/machine/machine_state_impl.rs
index 141ec43f94c385604c6b9be128f97e27201dfed2..c7075940fe3e44f9b78e60fd6b9fbf9bf5b46cc7 100644 (file)
--- a/src/machine/machine_state_impl.rs
+++ b/src/machine/machine_state_impl.rs
@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::tabled_rc::*;
-use prolog_parser_rebis::{clause_name, perm_v, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::tabled_rc::*;
+use prolog_parser::{clause_name, perm_v, temp_v};
 
 use crate::clause_types::*;
 use crate::forms::*;

diff --git a/src/machine/mod.rs b/src/machine/mod.rs
index c0550c1ec8a5942e092b0b968ac7af74278365ca..17ab0222e9122d8c63041ecc0a11652439217cb1 100644 (file)
--- a/src/machine/mod.rs
+++ b/src/machine/mod.rs
@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::tabled_rc::*;
-use prolog_parser_rebis::{clause_name, temp_v};
+use prolog_parser::ast::*;
+use prolog_parser::tabled_rc::*;
+use prolog_parser::{clause_name, temp_v};
 
 use lazy_static::lazy_static;
 
@@ -48,7 +48,7 @@ use crate::machine::streams::*;
 use indexmap::IndexMap;
 
 //use std::convert::TryFrom;
-use prolog_parser_rebis::ast::ClauseName;
+use prolog_parser::ast::ClauseName;
 use std::fs::File;
 use std::mem;
 use std::path::PathBuf;

diff --git a/src/machine/preprocessor.rs b/src/machine/preprocessor.rs
index a15924c146d2da431900b1fb5a89f4a738a8c109..4a8bd7b43c1d5e03bd04bfbb400750c14e9f5da9 100644 (file)
--- a/src/machine/preprocessor.rs
+++ b/src/machine/preprocessor.rs
@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::tabled_rc::*;
-use prolog_parser_rebis::{atom, clause_name, rc_atom};
+use prolog_parser::ast::*;
+use prolog_parser::tabled_rc::*;
+use prolog_parser::{atom, clause_name, rc_atom};
 
 use crate::forms::*;
 use crate::iterators::*;

diff --git a/src/machine/streams.rs b/src/machine/streams.rs
index dfa98eb3f805dbdc841588bc8d66bf24be16535f..21ffbbda17e28c83ded71da9ae1ff339963fcdfd 100644 (file)
--- a/src/machine/streams.rs
+++ b/src/machine/streams.rs
@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::clause_name;
+use prolog_parser::ast::*;
+use prolog_parser::clause_name;
 
 use crate::machine::machine_errors::*;
 use crate::machine::machine_indices::*;

diff --git a/src/machine/system_calls.rs b/src/machine/system_calls.rs
index 61c7fbfe8ab35b9aa9d52fc834e0f1ece8f19b2f..a75743332aac9971576ab4a041d97eaf0b68befe 100644 (file)
--- a/src/machine/system_calls.rs
+++ b/src/machine/system_calls.rs
@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::parser::*;
-use prolog_parser_rebis::{
+use prolog_parser::ast::*;
+use prolog_parser::parser::*;
+use prolog_parser::{
     alpha_char, binary_digit_char, clause_name, decimal_digit_char, exponent_char, graphic_char,
     graphic_token_char, hexadecimal_digit_char, layout_char, meta_char, new_line_char,
     octal_digit_char, prolog_char, sign_char, solo_char, symbolic_control_char,
@@ -67,10 +67,9 @@ use sodiumoxide::crypto::scalarmult::curve25519::*;
 
 use native_tls::TlsConnector;
 
-extern crate select;
-
 use base64;
 use roxmltree;
+use select;
 
 pub fn get_key() -> KeyEvent {
     let key;

diff --git a/src/machine/term_stream.rs b/src/machine/term_stream.rs
index 1305ad65c47fb74386dbdeeedaaa3a70242f0d3d..d87f9e25f8104e5227a66534db7c9ff1d2c8ec6c 100644 (file)
--- a/src/machine/term_stream.rs
+++ b/src/machine/term_stream.rs
@@ -1,5 +1,5 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::parser::*;
+use prolog_parser::ast::*;
+use prolog_parser::parser::*;
 
 use crate::machine::machine_errors::CompilationError;
 use crate::machine::preprocessor::*;

diff --git a/src/read.rs b/src/read.rs
index ac2d3fa0156983b440785bb50c5c2192bc5235ef..b55849a97fe2b9b62ac3e9090030f13ae50eec8b 100644 (file)
--- a/src/read.rs
+++ b/src/read.rs
@@ -1,6 +1,6 @@
-use prolog_parser_rebis::ast::*;
-use prolog_parser_rebis::parser::*;
-use prolog_parser_rebis::tabled_rc::TabledData;
+use prolog_parser::ast::*;
+use prolog_parser::parser::*;
+use prolog_parser::tabled_rc::TabledData;
 
 use crate::forms::*;
 use crate::iterators::*;

diff --git a/src/targets.rs b/src/targets.rs
index c59fe47fb2efa7b5e09585e7704376997d86e7fc..956da22af1fac20de94a2b7037682299a9948c15 100644 (file)
--- a/src/targets.rs
+++ b/src/targets.rs
@@ -1,4 +1,4 @@
-use prolog_parser_rebis::ast::*;
+use prolog_parser::ast::*;
 
 use crate::clause_types::*;
 use crate::forms::*;