summaryrefslogtreecommitdiff
path: root/dhall_syntax
diff options
context:
space:
mode:
authorNadrieril2019-09-09 22:24:27 +0200
committerNadrieril2019-09-09 22:25:06 +0200
commit595a52018e31126ecbf1be49794750f1a59a66b1 (patch)
tree09d6fad1f5662be9def4476d94b3c0823b6cee13 /dhall_syntax
parent0388d9858627693bab2433f134eb4ed1d6e9b164 (diff)
Move pest_consume into its own crate
Diffstat (limited to '')
-rw-r--r--dhall_syntax/Cargo.toml1
-rw-r--r--dhall_syntax/src/parser.rs132
2 files changed, 4 insertions, 129 deletions
diff --git a/dhall_syntax/Cargo.toml b/dhall_syntax/Cargo.toml
index eb492d0..450175c 100644
--- a/dhall_syntax/Cargo.toml
+++ b/dhall_syntax/Cargo.toml
@@ -18,3 +18,4 @@ hex = "0.3.2"
lazy_static = "1.4.0"
dhall_generated_parser = { path = "../dhall_generated_parser" }
dhall_proc_macros = { path = "../dhall_proc_macros" }
+pest_consume = { path = "../pest_consume" }
diff --git a/dhall_syntax/src/parser.rs b/dhall_syntax/src/parser.rs
index c8b3fe6..6c47de4 100644
--- a/dhall_syntax/src/parser.rs
+++ b/dhall_syntax/src/parser.rs
@@ -6,7 +6,7 @@ use pest::Parser;
use std::rc::Rc;
use dhall_generated_parser::{DhallParser, Rule};
-use dhall_proc_macros::{make_parser, parse_children};
+use pest_consume::{make_parser, parse_children};
use crate::map::{DupTreeMap, DupTreeSet};
use crate::ExprF::*;
@@ -19,138 +19,12 @@ use crate::*;
type ParsedText<E> = InterpolatedText<Expr<E>>;
type ParsedTextContents<E> = InterpolatedTextContents<Expr<E>>;
+type ParseInput<'input, 'data> =
+ pest_consume::ParseInput<'input, 'data, Rule, Rc<str>>;
pub type ParseError = pest::error::Error<Rule>;
-
pub type ParseResult<T> = Result<T, ParseError>;
-pub mod pest_consume {
- use pest::error::{Error, ErrorVariant};
- use pest::iterators::Pair;
- use pest::Span;
-
- /// Carries a pest Pair alongside custom user data.
- #[derive(Debug, Clone)]
- pub struct ParseInput<'input, 'data, Rule, Data>
- where
- Rule: pest::RuleType,
- {
- pair: Pair<'input, Rule>,
- user_data: &'data Data,
- }
-
- impl<'input, 'data, Rule, Data> ParseInput<'input, 'data, Rule, Data>
- where
- Rule: pest::RuleType,
- {
- pub fn new(pair: Pair<'input, Rule>, user_data: &'data Data) -> Self {
- ParseInput { pair, user_data }
- }
- /// Create an error that points to the span of the input.
- pub fn error(&self, message: String) -> Error<Rule> {
- let message = format!(
- "{} while matching on:\n{}",
- message,
- debug_pair(self.pair.clone())
- );
- Error::new_from_span(
- ErrorVariant::CustomError { message },
- self.as_span(),
- )
- }
- /// Reconstruct the input with a new pair, passing the user data along.
- pub fn with_pair(&self, new_pair: Pair<'input, Rule>) -> Self {
- ParseInput {
- pair: new_pair,
- user_data: self.user_data,
- }
- }
- /// If the contained pair has exactly one child, return a new Self containing it.
- pub fn single_child(&self) -> Option<Self> {
- let mut children = self.pair.clone().into_inner();
- if let Some(child) = children.next() {
- if children.next().is_none() {
- return Some(self.with_pair(child));
- }
- }
- None
- }
-
- pub fn user_data(&self) -> &'data Data {
- self.user_data
- }
- pub fn as_pair(&self) -> &Pair<'input, Rule> {
- &self.pair
- }
- pub fn as_span(&self) -> Span<'input> {
- self.pair.as_span()
- }
- pub fn as_str(&self) -> &'input str {
- self.pair.as_str()
- }
- pub fn as_rule(&self) -> Rule {
- self.pair.as_rule()
- }
- }
-
- /// Used by the macros.
- pub trait PestConsumer {
- type Rule: pest::RuleType;
- fn rule_alias(rule: Self::Rule) -> String;
- fn allows_shortcut(rule: Self::Rule) -> bool;
- }
-
- /// Pretty-print a pair and its nested children.
- fn debug_pair<Rule: pest::RuleType>(pair: Pair<Rule>) -> String {
- use std::fmt::Write;
- let mut s = String::new();
- fn aux<Rule: pest::RuleType>(
- s: &mut String,
- indent: usize,
- prefix: String,
- pair: Pair<Rule>,
- ) {
- let indent_str = "| ".repeat(indent);
- let rule = pair.as_rule();
- let contents = pair.as_str();
- let mut inner = pair.into_inner();
- let mut first = true;
- while let Some(p) = inner.next() {
- if first {
- first = false;
- let last = inner.peek().is_none();
- if last && p.as_str() == contents {
- let prefix = format!("{}{:?} > ", prefix, rule);
- aux(s, indent, prefix, p);
- continue;
- } else {
- writeln!(
- s,
- r#"{}{}{:?}: "{}""#,
- indent_str, prefix, rule, contents
- )
- .unwrap();
- }
- }
- aux(s, indent + 1, "".into(), p);
- }
- if first {
- writeln!(
- s,
- r#"{}{}{:?}: "{}""#,
- indent_str, prefix, rule, contents
- )
- .unwrap();
- }
- }
- aux(&mut s, 0, "".into(), pair);
- s
- }
-}
-
-type ParseInput<'input, 'data> =
- pest_consume::ParseInput<'input, 'data, Rule, Rc<str>>;
-
#[derive(Debug)]
enum Either<A, B> {
Left(A),