mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-27 06:23:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

revset: inline trivial parsing functions to eliminate obvious assertions

Browse source
This commit is contained in:
Yuya Nishihara 2024-06-02 22:03:09 +09:00
parent 441175f2f9
commit 674d897352
1 changed files with 17 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/src/revset_parser.rs
View file

@ -581,10 +581,25 @@ fn parse_primary_node(pair: Pair<Rule>) -> Result<ExpressionNode, RevsetParseErr
let function = Box::new(parse_function_call_node(first, arguments_pair)?); let function = Box::new(parse_function_call_node(first, arguments_pair)?);
ExpressionKind::FunctionCall(function) ExpressionKind::FunctionCall(function)
} }
Rule::string_pattern => parse_string_pattern(first), Rule::string_pattern => {
let (lhs, op, rhs) = first.into_inner().collect_tuple().unwrap();
assert_eq!(lhs.as_rule(), Rule::identifier);
assert_eq!(op.as_rule(), Rule::pattern_kind_op);
assert_eq!(rhs.as_rule(), Rule::symbol);
let kind = lhs.as_str();
let value = parse_as_string_literal(rhs.into_inner());
ExpressionKind::StringPattern { kind, value }
}
// Symbol without "@" may be substituted by aliases. Primary expression including "@" // Symbol without "@" may be substituted by aliases. Primary expression including "@"
// is considered an indecomposable unit, and no alias substitution would be made. // is considered an indecomposable unit, and no alias substitution would be made.
Rule::symbol if pairs.peek().is_none() => parse_symbol(first.into_inner()), Rule::symbol if pairs.peek().is_none() => {
let pairs = first.into_inner();
let first = pairs.peek().unwrap();
match first.as_rule() {
Rule::identifier => ExpressionKind::Identifier(first.as_str()),
_ => ExpressionKind::String(parse_as_string_literal(pairs)),
}
}
Rule::symbol => { Rule::symbol => {
let name = parse_as_string_literal(first.into_inner()); let name = parse_as_string_literal(first.into_inner());
assert_eq!(pairs.next().unwrap().as_rule(), Rule::at_op); assert_eq!(pairs.next().unwrap().as_rule(), Rule::at_op);
@ -605,27 +620,6 @@ fn parse_primary_node(pair: Pair<Rule>) -> Result<ExpressionNode, RevsetParseErr
Ok(ExpressionNode::new(expr, span)) Ok(ExpressionNode::new(expr, span))
} }
// TODO: inline
fn parse_string_pattern(pair: Pair<Rule>) -> ExpressionKind {
assert_eq!(pair.as_rule(), Rule::string_pattern);
let (lhs, op, rhs) = pair.into_inner().collect_tuple().unwrap();
assert_eq!(lhs.as_rule(), Rule::identifier);
assert_eq!(op.as_rule(), Rule::pattern_kind_op);
assert_eq!(rhs.as_rule(), Rule::symbol);
let kind = lhs.as_str();
let value = parse_as_string_literal(rhs.into_inner());
ExpressionKind::StringPattern { kind, value }
}
// TODO: inline
fn parse_symbol(pairs: Pairs<Rule>) -> ExpressionKind {
let first = pairs.peek().unwrap();
match first.as_rule() {
Rule::identifier => ExpressionKind::Identifier(first.as_str()),
_ => ExpressionKind::String(parse_as_string_literal(pairs)),
}
}
/// Parses part of compound symbol to string. /// Parses part of compound symbol to string.
fn parse_as_string_literal(mut pairs: Pairs<Rule>) -> String { fn parse_as_string_literal(mut pairs: Pairs<Rule>) -> String {
let first = pairs.next().unwrap(); let first = pairs.next().unwrap();