mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-27 06:27:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

revset: add ParseState constructor

Browse source
This commit is contained in:
Yuya Nishihara 2024-03-31 15:16:29 +09:00
parent acf8a8e1b2
commit 13dadadcdc
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/src/revset.rs
View file

@ -784,7 +784,21 @@ struct ParseState<'a> {
allow_string_pattern: bool,
}
impl ParseState<'_> {
impl<'a> ParseState<'a> {
fn new(
context: &'a RevsetParseContext,
locals: &'a HashMap<&str, Rc<RevsetExpression>>,
) -> Self {
ParseState {
aliases_map: context.aliases_map,
aliases_expanding: &[],
locals,
user_email: &context.user_email,
workspace_ctx: &context.workspace,
allow_string_pattern: false,
}
}
fn with_alias_expanding<T>(
self,
id: RevsetAliasId<'_>,
@ -1506,14 +1520,8 @@ pub fn parse(
revset_str: &str,
context: &RevsetParseContext,
) -> Result<Rc<RevsetExpression>, RevsetParseError> {
let state = ParseState {
aliases_map: context.aliases_map,
aliases_expanding: &[],
locals: &HashMap::new(),
user_email: &context.user_email,
workspace_ctx: &context.workspace,
allow_string_pattern: false,
};
let locals = HashMap::new();
let state = ParseState::new(context, &locals);
parse_program(revset_str, state)
}