mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-16 09:11:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

templater: move build_core_method() to table object

Browse source 
Just for convenience.
This commit is contained in:
Yuya Nishihara 2024-02-27 15:49:38 +09:00
parent bdbb2dec65
commit a235aa51f6
3 changed files with 60 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/src/commit_templater.rs
View file

@ -68,7 +68,7 @@ impl<'repo> TemplateLanguage<'repo> for CommitTemplateLanguage<'repo> {
match property { match property {
CommitTemplatePropertyKind::Core(property) => { CommitTemplatePropertyKind::Core(property) => {
let table = &self.build_fn_table.core; let table = &self.build_fn_table.core;
template_builder::build_core_method(self, table, build_ctx, property, function) table.build_method(self, build_ctx, property, function)
} }
CommitTemplatePropertyKind::Commit(property) => { CommitTemplatePropertyKind::Commit(property) => {
let table = &self.build_fn_table.commit_methods; let table = &self.build_fn_table.commit_methods;

2
cli/src/operation_templater.rs
View file

@ -56,7 +56,7 @@ impl TemplateLanguage<'static> for OperationTemplateLanguage {
match property { match property {
OperationTemplatePropertyKind::Core(property) => { OperationTemplatePropertyKind::Core(property) => {
let table = &self.build_fn_table.core; let table = &self.build_fn_table.core;
template_builder::build_core_method(self, table, build_ctx, property, function) table.build_method(self, build_ctx, property, function)
} }
OperationTemplatePropertyKind::Operation(property) => { OperationTemplatePropertyKind::Operation(property) => {
let table = &self.build_fn_table.operation_methods; let table = &self.build_fn_table.operation_methods;

114
cli/src/template_builder.rs
View file

@ -254,6 +254,63 @@ impl<'a, L: TemplateLanguage<'a>> CoreTemplateBuildFnTable<'a, L> {
timestamp_range_methods: builtin_timestamp_range_methods(), timestamp_range_methods: builtin_timestamp_range_methods(),
} }
} }
/// Applies the method call node `function` to the given `property` by using
/// this symbol table.
pub fn build_method(
&self,
language: &L,
build_ctx: &BuildContext<L::Property>,
property: CoreTemplatePropertyKind<'a, L::Context>,
function: &FunctionCallNode,
) -> TemplateParseResult<L::Property> {
match property {
CoreTemplatePropertyKind::String(property) => {
let table = &self.string_methods;
let build = template_parser::lookup_method("String", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::StringList(property) => {
// TODO: migrate to table?
build_formattable_list_method(language, build_ctx, property, function, |item| {
language.wrap_string(item)
})
}
CoreTemplatePropertyKind::Boolean(property) => {
let table = &self.boolean_methods;
let build = template_parser::lookup_method("Boolean", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::Integer(property) => {
let table = &self.integer_methods;
let build = template_parser::lookup_method("Integer", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::Signature(property) => {
let table = &self.signature_methods;
let build = template_parser::lookup_method("Signature", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::Timestamp(property) => {
let table = &self.timestamp_methods;
let build = template_parser::lookup_method("Timestamp", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::TimestampRange(property) => {
let table = &self.timestamp_range_methods;
let build = template_parser::lookup_method("TimestampRange", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::Template(_) => {
// TODO: migrate to table?
Err(TemplateParseError::no_such_method("Template", function))
}
CoreTemplatePropertyKind::ListTemplate(template) => {
// TODO: migrate to table?
build_list_template_method(language, build_ctx, template, function)
}
}
}
} }
/// Opaque struct that represents a template value. /// Opaque struct that represents a template value.
@ -396,61 +453,6 @@ fn build_method_call<'a, L: TemplateLanguage<'a>>(
Ok(expression) Ok(expression)
} }
pub fn build_core_method<'a, L: TemplateLanguage<'a>>(
language: &L,
build_fn_table: &CoreTemplateBuildFnTable<'a, L>,
build_ctx: &BuildContext<L::Property>,
property: CoreTemplatePropertyKind<'a, L::Context>,
function: &FunctionCallNode,
) -> TemplateParseResult<L::Property> {
match property {
CoreTemplatePropertyKind::String(property) => {
let table = &build_fn_table.string_methods;
let build = template_parser::lookup_method("String", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::StringList(property) => {
// TODO: migrate to table?
build_formattable_list_method(language, build_ctx, property, function, |item| {
language.wrap_string(item)
})
}
CoreTemplatePropertyKind::Boolean(property) => {
let table = &build_fn_table.boolean_methods;
let build = template_parser::lookup_method("Boolean", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::Integer(property) => {
let table = &build_fn_table.integer_methods;
let build = template_parser::lookup_method("Integer", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::Signature(property) => {
let table = &build_fn_table.signature_methods;
let build = template_parser::lookup_method("Signature", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::Timestamp(property) => {
let table = &build_fn_table.timestamp_methods;
let build = template_parser::lookup_method("Timestamp", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::TimestampRange(property) => {
let table = &build_fn_table.timestamp_range_methods;
let build = template_parser::lookup_method("TimestampRange", table, function)?;
build(language, build_ctx, property, function)
}
CoreTemplatePropertyKind::Template(_) => {
// TODO: migrate to table?
Err(TemplateParseError::no_such_method("Template", function))
}
CoreTemplatePropertyKind::ListTemplate(template) => {
// TODO: migrate to table?
build_list_template_method(language, build_ctx, template, function)
}
}
}
fn builtin_string_methods<'a, L: TemplateLanguage<'a>>() -> TemplateBuildMethodFnMap<'a, L, String> fn builtin_string_methods<'a, L: TemplateLanguage<'a>>() -> TemplateBuildMethodFnMap<'a, L, String>
{ {
// Not using maplit::hashmap!{} or custom declarative macro here because // Not using maplit::hashmap!{} or custom declarative macro here because
@ -1051,7 +1053,7 @@ mod tests {
match property { match property {
TestTemplatePropertyKind::Core(property) => { TestTemplatePropertyKind::Core(property) => {
let table = &self.build_fn_table; let table = &self.build_fn_table;
build_core_method(self, table, build_ctx, property, function) table.build_method(self, build_ctx, property, function)
} }
TestTemplatePropertyKind::Unit => { TestTemplatePropertyKind::Unit => {
let build = self let build = self