Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 3 additions & 30 deletions keyvalues-parser/src/text/parse/escaped.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
use super::*;

use pest::Parser as _;

pub type PestError = pest::error::Error<Rule>;
type BoxedState<'a> = Box<pest::ParserState<'a, Rule>>;
type ParseResult<'a> = pest::ParseResult<BoxedState<'a>>;

struct Parser;

common_parsing!(Parser, Rule, true);
common_parsing!(pest_parse, Rule, true);

#[expect(non_camel_case_types, clippy::upper_case_acronyms)]
#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
Expand Down Expand Up @@ -192,29 +188,6 @@ mod rules {
}
}

impl pest::Parser<Rule> for Parser {
fn parse<'i>(
rule: Rule,
input: &'i str,
) -> std::result::Result<pest::iterators::Pairs<'i, Rule>, PestError> {
pest::state(input, |s| match rule {
Rule::WHITESPACE => super::whitespace(s),
Rule::COMMENT => super::comment(s),
Rule::vdf => rules::vdf(s),
Rule::base_macro => rules::base_macro(s),
Rule::quoted_raw_string => rules::quoted_raw_string(s),
Rule::quoted_raw_inner => rules::quoted_raw_inner(s),
Rule::pairs => rules::pairs(s),
Rule::pair => rules::pair(s),
Rule::key => rules::key(s),
Rule::value => rules::value(s),
Rule::obj => rules::obj(s),
Rule::quoted_string => rules::quoted_string(s),
Rule::quoted_inner => rules::quoted_inner(s),
Rule::char => rules::char(s),
Rule::unquoted_string => rules::unquoted_string(s),
Rule::unquoted_char => rules::unquoted_char(s),
Rule::EOI => rules::EOI(s),
})
}
pub fn pest_parse(input: &str) -> std::result::Result<pest::iterators::Pairs<'_, Rule>, PestError> {
pest::state(input, rules::vdf)
}
4 changes: 2 additions & 2 deletions keyvalues-parser/src/text/parse/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ fn skip<R: RuleType>(s: BoxedState<'_, R>) -> ParseResult<'_, R> {
// unfortunate hack to re-use most of the code that consumes the pest parser produced by our two
// separate grammars :/
macro_rules! common_parsing {
($parser:ty, $rule:ty, $parse_escaped:expr) => {
($parse_fn:ident, $rule:ty, $parse_escaped:expr) => {
/// Attempts to parse VDF text to a [`Vdf`]
pub fn parse(s: &str) -> Result<PartialVdf<'_>> {
let mut full_grammar = <$parser>::parse(<$rule>::vdf, s)?;
let mut full_grammar = $parse_fn(s)?;

// There can be multiple base macros before the initial pair
let mut bases = Vec::new();
Expand Down
31 changes: 3 additions & 28 deletions keyvalues-parser/src/text/parse/raw.rs
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
use super::*;

use pest::Parser as _;

pub type PestError = pest::error::Error<Rule>;
type BoxedState<'a> = Box<pest::ParserState<'a, Rule>>;
type ParseResult<'a> = pest::ParseResult<BoxedState<'a>>;

struct Parser;

common_parsing!(Parser, Rule, false);
common_parsing!(pest_parse, Rule, false);

#[expect(non_camel_case_types, clippy::upper_case_acronyms)]
#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
Expand Down Expand Up @@ -161,27 +157,6 @@ mod rules {
}
}

impl pest::Parser<Rule> for Parser {
fn parse<'i>(
rule: Rule,
input: &'i str,
) -> std::result::Result<pest::iterators::Pairs<'i, Rule>, PestError> {
pest::state(input, |s| match rule {
Rule::WHITESPACE => super::whitespace(s),
Rule::COMMENT => super::comment(s),
Rule::vdf => rules::vdf(s),
Rule::base_macro => rules::base_macro(s),
Rule::quoted_raw_string => rules::quoted_raw_string(s),
Rule::pairs => rules::pairs(s),
Rule::pair => rules::pair(s),
Rule::key => rules::key(s),
Rule::value => rules::value(s),
Rule::obj => rules::obj(s),
Rule::quoted_string => rules::quoted_string(s),
Rule::quoted_inner => rules::quoted_inner(s),
Rule::unquoted_string => rules::unquoted_string(s),
Rule::unquoted_char => rules::unquoted_char(s),
Rule::EOI => rules::EOI(s),
})
}
pub fn pest_parse(input: &str) -> std::result::Result<pest::iterators::Pairs<'_, Rule>, PestError> {
pest::state(input, rules::vdf)
}