From 5e5925e1890eacd89961848dd0f7c4e8fe0a22ce Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 6 Jun 2024 13:41:58 -0500 Subject: [PATCH] refactor(parser): Make parse_variable name available --- crates/core/src/parser/parser.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/core/src/parser/parser.rs b/crates/core/src/parser/parser.rs index 92335d8cb..7b7ef189d 100644 --- a/crates/core/src/parser/parser.rs +++ b/crates/core/src/parser/parser.rs @@ -124,7 +124,7 @@ fn parse_literal(literal: Pair) -> Value { /// Parses a `Variable` from a `Pair` with a variable. /// This `Pair` must be `Rule::Variable`. -fn parse_variable(variable: Pair) -> Variable { +fn parse_variable_pair(variable: Pair) -> Variable { if variable.as_rule() != Rule::Variable { panic!("Expected variable."); } @@ -163,7 +163,7 @@ fn parse_value(value: Pair) -> Expression { match value.as_rule() { Rule::Literal => Expression::Literal(parse_literal(value)), - Rule::Variable => Expression::Variable(parse_variable(value)), + Rule::Variable => Expression::Variable(parse_variable_pair(value)), _ => unreachable!(), } } @@ -971,7 +971,7 @@ impl<'a> TagToken<'a> { /// Tries to obtain a `Variable` from this token. pub fn expect_variable(mut self) -> TryMatchToken<'a, Variable> { match self.unwrap_variable() { - Ok(t) => TryMatchToken::Matches(parse_variable(t)), + Ok(t) => TryMatchToken::Matches(parse_variable_pair(t)), Err(_) => { self.expected.push(Rule::Variable); TryMatchToken::Fails(self) @@ -1121,7 +1121,7 @@ mod test { } #[test] - fn test_parse_variable() { + fn test_parse_variable_pair() { let variable = LiquidParser::parse(Rule::Variable, "foo[0].bar.baz[foo.bar]") .unwrap() .next() @@ -1137,7 +1137,7 @@ mod test { let mut expected = Variable::with_literal("foo"); expected.extend(indexes); - assert_eq!(parse_variable(variable), expected); + assert_eq!(parse_variable_pair(variable), expected); } #[test]