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: insert AST-level representation of program modifier

Browse source
This commit is contained in:
Yuya Nishihara 2024-06-03 16:13:34 +09:00
parent c51591bb4d
commit 3c1f6d5b5d
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/src/revset.rs
View file

@ -851,6 +851,15 @@ pub fn parse_with_modifier(
context: &RevsetParseContext, context: &RevsetParseContext,
) -> Result<(Rc<RevsetExpression>, Option<RevsetModifier>), RevsetParseError> { ) -> Result<(Rc<RevsetExpression>, Option<RevsetModifier>), RevsetParseError> {
let (node, modifier) = revset_parser::parse_program_with_modifier(revset_str)?; let (node, modifier) = revset_parser::parse_program_with_modifier(revset_str)?;
let modifier = modifier
.map(|n| match n.name {
"all" => Ok(RevsetModifier::All),
name => Err(RevsetParseError::with_span(
RevsetParseErrorKind::NoSuchModifier(name.to_owned()),
n.name_span,
)),
})
.transpose()?;
let node = dsl_util::expand_aliases(node, context.aliases_map)?; let node = dsl_util::expand_aliases(node, context.aliases_map)?;
let expression = lower_expression(&node, context) let expression = lower_expression(&node, context)
.map_err(|err| err.extend_function_candidates(context.aliases_map.function_names()))?; .map_err(|err| err.extend_function_candidates(context.aliases_map.function_names()))?;

25
lib/src/revset_parser.rs
View file

@ -31,8 +31,6 @@ use crate::dsl_util::{
AliasExpandError, AliasExpandableExpression, AliasId, AliasesMap, ExpressionFolder, AliasExpandError, AliasExpandableExpression, AliasId, AliasesMap, ExpressionFolder,
FoldableExpression, InvalidArguments, KeywordArgument, StringLiteralParser, FoldableExpression, InvalidArguments, KeywordArgument, StringLiteralParser,
}; };
// TODO: remove reverse dependency on revset module
use crate::revset::RevsetModifier;
#[derive(Parser)] #[derive(Parser)]
#[grammar = "revset.pest"] #[grammar = "revset.pest"]
@ -401,6 +399,14 @@ pub enum BinaryOp {
pub type ExpressionNode<'i> = dsl_util::ExpressionNode<'i, ExpressionKind<'i>>; pub type ExpressionNode<'i> = dsl_util::ExpressionNode<'i, ExpressionKind<'i>>;
pub type FunctionCallNode<'i> = dsl_util::FunctionCallNode<'i, ExpressionKind<'i>>; pub type FunctionCallNode<'i> = dsl_util::FunctionCallNode<'i, ExpressionKind<'i>>;
#[derive(Clone, Debug, Eq, PartialEq)]
pub struct ModifierNode<'i> {
/// Modifier name.
pub name: &'i str,
/// Span of the modifier name.
pub name_span: pest::Span<'i>,
}
pub(super) fn parse_program(revset_str: &str) -> Result<ExpressionNode, RevsetParseError> { pub(super) fn parse_program(revset_str: &str) -> Result<ExpressionNode, RevsetParseError> {
let mut pairs = RevsetParser::parse(Rule::program, revset_str)?; let mut pairs = RevsetParser::parse(Rule::program, revset_str)?;
let first = pairs.next().unwrap(); let first = pairs.next().unwrap();
@ -409,7 +415,7 @@ pub(super) fn parse_program(revset_str: &str) -> Result<ExpressionNode, RevsetPa
pub(super) fn parse_program_with_modifier( pub(super) fn parse_program_with_modifier(
revset_str: &str, revset_str: &str,
) -> Result<(ExpressionNode, Option<RevsetModifier>), RevsetParseError> { ) -> Result<(ExpressionNode, Option<ModifierNode>), RevsetParseError> {
let mut pairs = RevsetParser::parse(Rule::program_with_modifier, revset_str)?; let mut pairs = RevsetParser::parse(Rule::program_with_modifier, revset_str)?;
let first = pairs.next().unwrap(); let first = pairs.next().unwrap();
match first.as_rule() { match first.as_rule() {
@ -423,17 +429,12 @@ pub(super) fn parse_program_with_modifier(
assert_eq!(lhs.as_rule(), Rule::identifier); assert_eq!(lhs.as_rule(), Rule::identifier);
assert_eq!(op.as_rule(), Rule::pattern_kind_op); assert_eq!(op.as_rule(), Rule::pattern_kind_op);
assert_eq!(rhs.as_rule(), Rule::expression); assert_eq!(rhs.as_rule(), Rule::expression);
let modififer = match lhs.as_str() { let modifier = ModifierNode {
"all" => RevsetModifier::All, name: lhs.as_str(),
name => { name_span: lhs.as_span(),
return Err(RevsetParseError::with_span(
RevsetParseErrorKind::NoSuchModifier(name.to_owned()),
lhs.as_span(),
));
}
}; };
let node = parse_expression_node(rhs.into_inner())?; let node = parse_expression_node(rhs.into_inner())?;
Ok((node, Some(modififer))) Ok((node, Some(modifier)))
} }
r => panic!("unexpected revset parse rule: {r:?}"), r => panic!("unexpected revset parse rule: {r:?}"),
} }