summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cargo.lock1
-rw-r--r--dhall_syntax/Cargo.toml1
-rw-r--r--dhall_syntax/src/parser.rs6
3 files changed, 3 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock
index aa4b536..da99b8e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -108,7 +108,6 @@ dependencies = [
name = "dhall_syntax"
version = "0.1.0"
dependencies = [
- "dhall_generated_parser 0.1.0",
"either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
"hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/dhall_syntax/Cargo.toml b/dhall_syntax/Cargo.toml
index 2724fa5..d732bff 100644
--- a/dhall_syntax/Cargo.toml
+++ b/dhall_syntax/Cargo.toml
@@ -16,6 +16,5 @@ either = "1.5.2"
take_mut = "0.2.2"
hex = "0.3.2"
lazy_static = "1.4.0"
-dhall_generated_parser = { path = "../dhall_generated_parser" }
# pest_consume = { path = "../../pest_consume/pest_consume" }
pest_consume = "1.0"
diff --git a/dhall_syntax/src/parser.rs b/dhall_syntax/src/parser.rs
index f5d161f..3ea766f 100644
--- a/dhall_syntax/src/parser.rs
+++ b/dhall_syntax/src/parser.rs
@@ -3,8 +3,6 @@ use pest::prec_climber as pcl;
use pest::prec_climber::PrecClimber;
use std::rc::Rc;
-use dgp::Rule;
-use dhall_generated_parser as dgp;
use pest_consume::{match_nodes, Parser};
use crate::map::{DupTreeMap, DupTreeSet};
@@ -147,9 +145,11 @@ lazy_static::lazy_static! {
};
}
+#[derive(Parser)]
+#[grammar = "../../dhall_generated_parser/src/dhall.pest"]
struct DhallParser;
-#[pest_consume::parser(parser = dgp::DhallParser, rule = dgp::Rule)]
+#[pest_consume::parser(parser = DhallParser, rule = Rule)]
impl DhallParser {
fn EOI(_input: ParseInput) -> ParseResult<()> {
Ok(())