diff options
| -rw-r--r-- | Cargo.lock | 20 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | dhall_core/Cargo.toml | 2 | ||||
| -rw-r--r-- | dhall_core/src/parser.rs | 2 | ||||
| -rw-r--r-- | dhall_generated_parser/.gitignore (renamed from dhall_parser/.gitignore) | 0 | ||||
| -rw-r--r-- | dhall_generated_parser/Cargo.toml (renamed from dhall_parser/Cargo.toml) | 2 | ||||
| -rw-r--r-- | dhall_generated_parser/build.rs (renamed from dhall_parser/build.rs) | 0 | ||||
| l--------- | dhall_generated_parser/src/dhall.abnf (renamed from dhall_parser/src/dhall.abnf) | 0 | ||||
| -rw-r--r-- | dhall_generated_parser/src/dhall.pest.visibility (renamed from dhall_parser/src/dhall.pest.visibility) | 0 | ||||
| -rw-r--r-- | dhall_generated_parser/src/lib.rs (renamed from dhall_parser/src/lib.rs) | 6 |
10 files changed, 15 insertions, 19 deletions
@@ -82,31 +82,31 @@ dependencies = [ name = "dhall_core" version = "0.1.0" dependencies = [ - "dhall_parser 0.1.0", + "dhall_generated_parser 0.1.0", "iter_patterns 0.1.0", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "pest 2.1.0 (git+https://github.com/pest-parser/pest)", ] [[package]] -name = "dhall_generator" +name = "dhall_generated_parser" version = "0.1.0" dependencies = [ - "dhall_core 0.1.0", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", + "abnf_to_pest 0.1.0", + "pest 2.1.0 (git+https://github.com/pest-parser/pest)", + "pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "dhall_parser" +name = "dhall_generator" version = "0.1.0" dependencies = [ - "abnf_to_pest 0.1.0", - "pest 2.1.0 (git+https://github.com/pest-parser/pest)", - "pest_generator 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "dhall_core 0.1.0", + "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 0.4.27 (registry+https://github.com/rust-lang/crates.io-index)", "quote 0.6.11 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 0.15.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4,7 +4,7 @@ cargo-features = ["profile-overrides"] members = [ "abnf_to_pest", "dhall", - "dhall_parser", + "dhall_generated_parser", "dhall_core", "dhall_generator", "iter_patterns", diff --git a/dhall_core/Cargo.toml b/dhall_core/Cargo.toml index f4aaf10..f51318f 100644 --- a/dhall_core/Cargo.toml +++ b/dhall_core/Cargo.toml @@ -11,5 +11,5 @@ doctest = false [dependencies] itertools = "0.8.0" pest = { git = "https://github.com/pest-parser/pest" } -dhall_parser = { path = "../dhall_parser" } +dhall_generated_parser = { path = "../dhall_generated_parser" } iter_patterns = { path = "../iter_patterns" } diff --git a/dhall_core/src/parser.rs b/dhall_core/src/parser.rs index e83f8a4..2d47ad7 100644 --- a/dhall_core/src/parser.rs +++ b/dhall_core/src/parser.rs @@ -5,7 +5,7 @@ pub use pest::Span; use std::collections::BTreeMap; use std::path::PathBuf; -use dhall_parser::{DhallParser, Rule}; +use dhall_generated_parser::{DhallParser, Rule}; use crate::*; diff --git a/dhall_parser/.gitignore b/dhall_generated_parser/.gitignore index 8a0bac6..8a0bac6 100644 --- a/dhall_parser/.gitignore +++ b/dhall_generated_parser/.gitignore diff --git a/dhall_parser/Cargo.toml b/dhall_generated_parser/Cargo.toml index 5ee7eca..9e4ae49 100644 --- a/dhall_parser/Cargo.toml +++ b/dhall_generated_parser/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "dhall_parser" +name = "dhall_generated_parser" version = "0.1.0" authors = ["Nadrieril <nadrieril@users.noreply.github.com>"] license = "BSD-2-Clause" diff --git a/dhall_parser/build.rs b/dhall_generated_parser/build.rs index 615a55c..615a55c 100644 --- a/dhall_parser/build.rs +++ b/dhall_generated_parser/build.rs diff --git a/dhall_parser/src/dhall.abnf b/dhall_generated_parser/src/dhall.abnf index ce13b8e..ce13b8e 120000 --- a/dhall_parser/src/dhall.abnf +++ b/dhall_generated_parser/src/dhall.abnf diff --git a/dhall_parser/src/dhall.pest.visibility b/dhall_generated_parser/src/dhall.pest.visibility index f881a50..f881a50 100644 --- a/dhall_parser/src/dhall.pest.visibility +++ b/dhall_generated_parser/src/dhall.pest.visibility diff --git a/dhall_parser/src/lib.rs b/dhall_generated_parser/src/lib.rs index e0843af..97a0d54 100644 --- a/dhall_parser/src/lib.rs +++ b/dhall_generated_parser/src/lib.rs @@ -1,14 +1,10 @@ // This crate only contains the grammar-generated parser. The rest of the // parser is in dhall_core. This separation is because compiling the -// grammar-generated parser is extremely slow. Eventually, the whole parser -// should probably be moved to here. +// grammar-generated parser is extremely slow. // See the https://pest.rs documentation for details on what this crate contains. // The pest file is auto-generated and is located at ./dhall.pest. // It is generated from grammar.abnf in a rather straightforward manner. Some // additional overrides are done in ../build.rs. // The lines that are commented out in ./dhall.pest.visibility are marked as // silent (see pest docs for what that means) in the generated pest file. -// The abnf file has quite a lot of modifications compared to the one from -// the standard. Hopefully those changes should be merged upstream, but for now -// feel free to edit it to make parsing easier. include!(concat!(env!("OUT_DIR"), "/grammar.rs")); |