From: Skgland Date: Sat, 6 Feb 2021 20:57:27 +0000 (+0100) Subject: rename `prolog_parser_rebis` to `prolog_parser` X-Git-Tag: v0.9.0~150^2~65^2~6^2~1 X-Git-Url: https://git.sagredo.dev/?a=commitdiff_plain;h=5041042925cf0b6a97a9bb8a8f7007b4b70d9cbe;p=scryer-prolog.git 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 ef3f28a0..43771e59 100644 --- 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 c49eebcf..708125ec 100644 --- 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 3cd4421d..c0865b52 100644 --- 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 f90f0d69..57d62880 100644 --- 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 83114a6e..17f0c27f 100644 --- 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 "] edition = "2018" diff --git a/crates/prolog_parser/tests/bom.rs b/crates/prolog_parser/tests/bom.rs index 25b57104..8a92c127 100644 --- 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 3afb9164..69b63286 100644 --- 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 8d447fb1..73d281cd 100644 --- 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 68f9f483..7941ed3b 100644 --- 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 5096ffad..a3fa0ee8 100644 --- 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 41bd72c6..cb9c4a97 100644 --- 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 ed0b9704..4d69a344 100644 --- 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 002774de..94d10c25 100644 --- 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 5dfc680d..11090601 100644 --- 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 a4c1354a..aadd2e0f 100644 --- 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 1b14f301..16f0ce33 100644 --- 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 585cd2cb..98002bce 100644 --- 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 beb81ca4..fc4fbdc3 100644 --- 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 b21cb7a9..63ec2d6d 100644 --- 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 4bc90fc4..aee385f0 100644 --- 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 1ab52a73..af25b3e8 100644 --- 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 c6115662..7f9323c1 100644 --- 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 5ddd2c9f..ebca8518 100644 --- 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 040e478c..91d41c7f 100644 --- 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 b1d60bb3..eab52770 100644 --- 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 918af24c..6bb9dffd 100644 --- 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 f7160134..6fedf6bb 100644 --- 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 141ec43f..c7075940 100644 --- 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 c0550c1e..17ab0222 100644 --- 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 a15924c1..4a8bd7b4 100644 --- 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 dfa98eb3..21ffbbda 100644 --- 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 61c7fbfe..a7574333 100644 --- 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 1305ad65..d87f9e25 100644 --- 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 ac2d3fa0..b55849a9 100644 --- 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 c59fe47f..956da22a 100644 --- 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::*;