mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-25 13:40:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fileset: extract inner function that parses string-like literal

Browse source 
I'm going to add single-quoted string literal.
This commit is contained in:
Yuya Nishihara 2024-04-17 22:03:49 +09:00
parent ca02141ba9
commit 37bd966357
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/src/fileset_parser.rs
View file

@ -229,6 +229,14 @@ fn parse_function_call_node(pair: Pair<Rule>) -> FilesetParseResult<FunctionCall
}) })
} }
fn parse_as_string_literal(pair: Pair<Rule>) -> String {
match pair.as_rule() {
Rule::identifier => pair.as_str().to_owned(),
Rule::string_literal => STRING_LITERAL_PARSER.parse(pair.into_inner()),
r => panic!("unexpected string literal rule: {r:?}"),
}
}
fn parse_primary_node(pair: Pair<Rule>) -> FilesetParseResult<ExpressionNode> { fn parse_primary_node(pair: Pair<Rule>) -> FilesetParseResult<ExpressionNode> {
assert_eq!(pair.as_rule(), Rule::primary); assert_eq!(pair.as_rule(), Rule::primary);
let first = pair.into_inner().next().unwrap(); let first = pair.into_inner().next().unwrap();
@ -244,18 +252,11 @@ fn parse_primary_node(pair: Pair<Rule>) -> FilesetParseResult<ExpressionNode> {
assert_eq!(lhs.as_rule(), Rule::strict_identifier); assert_eq!(lhs.as_rule(), Rule::strict_identifier);
assert_eq!(op.as_rule(), Rule::pattern_kind_op); assert_eq!(op.as_rule(), Rule::pattern_kind_op);
let kind = lhs.as_str(); let kind = lhs.as_str();
let value = match rhs.as_rule() { let value = parse_as_string_literal(rhs);
Rule::identifier => rhs.as_str().to_owned(),
Rule::string_literal => STRING_LITERAL_PARSER.parse(rhs.into_inner()),
r => panic!("unexpected string pattern rule: {r:?}"),
};
ExpressionKind::StringPattern { kind, value } ExpressionKind::StringPattern { kind, value }
} }
Rule::identifier => ExpressionKind::Identifier(first.as_str()), Rule::identifier => ExpressionKind::Identifier(first.as_str()),
Rule::string_literal => { Rule::string_literal => ExpressionKind::String(parse_as_string_literal(first)),
let text = STRING_LITERAL_PARSER.parse(first.into_inner());
ExpressionKind::String(text)
}
r => panic!("unexpected primary rule: {r:?}"), r => panic!("unexpected primary rule: {r:?}"),
}; };
Ok(ExpressionNode::new(expr, span)) Ok(ExpressionNode::new(expr, span))