From c58d1acba89824d02eb6939b40df7c92b4db3581 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 20 Aug 2021 14:29:01 +0200 Subject: improve naming --- .../functions/FN_multi_function_procedure_builder.hh | 18 +++++++++--------- .../intern/multi_function_procedure_builder.cc | 16 ++++++++-------- .../tests/FN_multi_function_procedure_test.cc | 19 +++++++++---------- 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/source/blender/functions/FN_multi_function_procedure_builder.hh b/source/blender/functions/FN_multi_function_procedure_builder.hh index 5f968f2de31..1088c18a8b9 100644 --- a/source/blender/functions/FN_multi_function_procedure_builder.hh +++ b/source/blender/functions/FN_multi_function_procedure_builder.hh @@ -76,15 +76,16 @@ class MFProcedureBuilder { void add_loop_continue(Loop &loop); void add_loop_break(Loop &loop); - MFCallInstruction &add_call(const MultiFunction &fn); - MFCallInstruction &add_call(const MultiFunction &fn, Span variables); + MFCallInstruction &add_call_with_no_variables(const MultiFunction &fn); + MFCallInstruction &add_call_with_all_variables(const MultiFunction &fn, + Span param_variables); - Vector add_call_with_new_variables( - const MultiFunction &fn, Span input_and_mutable_variables = {}); + Vector add_call(const MultiFunction &fn, + Span input_and_mutable_variables = {}); template - std::array add_call_with_new_variables( - const MultiFunction &fn, Span input_and_mutable_variables = {}); + std::array add_call(const MultiFunction &fn, + Span input_and_mutable_variables = {}); void add_parameter(MFParamType::InterfaceType interface_type, MFVariable &variable); MFVariable &add_parameter(MFParamType param_type, std::string name = ""); @@ -192,11 +193,10 @@ inline void MFProcedureBuilder::set_cursor(Span builders) } template -inline std::array MFProcedureBuilder::add_call_with_new_variables( +inline std::array MFProcedureBuilder::add_call( const MultiFunction &fn, Span input_and_mutable_variables) { - Vector output_variables = this->add_call_with_new_variables( - fn, input_and_mutable_variables); + Vector output_variables = this->add_call(fn, input_and_mutable_variables); BLI_assert(output_variables.size() == OutputN); std::array output_array; diff --git a/source/blender/functions/intern/multi_function_procedure_builder.cc b/source/blender/functions/intern/multi_function_procedure_builder.cc index b27a25d63cf..1e686bbd94d 100644 --- a/source/blender/functions/intern/multi_function_procedure_builder.cc +++ b/source/blender/functions/intern/multi_function_procedure_builder.cc @@ -72,7 +72,7 @@ void MFProcedureBuilder::add_destruct(Span variables) } } -MFCallInstruction &MFProcedureBuilder::add_call(const MultiFunction &fn) +MFCallInstruction &MFProcedureBuilder::add_call_with_no_variables(const MultiFunction &fn) { MFCallInstruction &instruction = procedure_->new_call_instruction(fn); this->link_to_cursors(&instruction); @@ -80,19 +80,19 @@ MFCallInstruction &MFProcedureBuilder::add_call(const MultiFunction &fn) return instruction; } -MFCallInstruction &MFProcedureBuilder::add_call(const MultiFunction &fn, - Span variables) +MFCallInstruction &MFProcedureBuilder::add_call_with_all_variables( + const MultiFunction &fn, Span param_variables) { - MFCallInstruction &instruction = this->add_call(fn); - instruction.set_params(variables); + MFCallInstruction &instruction = this->add_call_with_no_variables(fn); + instruction.set_params(param_variables); return instruction; } -Vector MFProcedureBuilder::add_call_with_new_variables( - const MultiFunction &fn, Span input_and_mutable_variables) +Vector MFProcedureBuilder::add_call(const MultiFunction &fn, + Span input_and_mutable_variables) { Vector output_variables; - MFCallInstruction &instruction = this->add_call(fn); + MFCallInstruction &instruction = this->add_call_with_no_variables(fn); for (const int param_index : fn.param_indices()) { const MFParamType param_type = fn.param_type(param_index); switch (param_type.interface_type()) { diff --git a/source/blender/functions/tests/FN_multi_function_procedure_test.cc b/source/blender/functions/tests/FN_multi_function_procedure_test.cc index 5e728db4d3b..22e69cca4f2 100644 --- a/source/blender/functions/tests/FN_multi_function_procedure_test.cc +++ b/source/blender/functions/tests/FN_multi_function_procedure_test.cc @@ -26,8 +26,8 @@ TEST(multi_function_procedure, SimpleTest) MFVariable *var1 = &builder.add_single_input_parameter(); MFVariable *var2 = &builder.add_single_input_parameter(); - auto [var3] = builder.add_call_with_new_variables<1>(add_fn, {var1, var2}); - auto [var4] = builder.add_call_with_new_variables<1>(add_fn, {var2, var3}); + auto [var3] = builder.add_call<1>(add_fn, {var1, var2}); + auto [var4] = builder.add_call<1>(add_fn, {var2, var3}); builder.add_call(add_10_fn, {var4}); builder.add_destruct({var1, var2, var3}); builder.add_output_parameter(*var4); @@ -118,7 +118,7 @@ TEST(multi_function_procedure, EvaluateOne) MFProcedureBuilder builder{procedure}; MFVariable *var1 = &builder.add_single_input_parameter(); - auto [var2] = builder.add_call_with_new_variables<1>(add_10_fn, {var1}); + auto [var2] = builder.add_call<1>(add_10_fn, {var1}); builder.add_destruct(*var1); builder.add_output_parameter(*var2); @@ -170,14 +170,13 @@ TEST(multi_function_procedure, SimpleLoop) MFProcedureBuilder builder{procedure}; MFVariable *var_count = &builder.add_single_input_parameter("count"); - auto [var_out] = builder.add_call_with_new_variables<1>(const_1_fn); + auto [var_out] = builder.add_call<1>(const_1_fn); var_out->set_name("out"); - auto [var_index] = builder.add_call_with_new_variables<1>(const_0_fn); + auto [var_index] = builder.add_call<1>(const_0_fn); var_index->set_name("index"); MFProcedureBuilder::Loop loop = builder.add_loop(); - auto [var_condition] = builder.add_call_with_new_variables<1>(greater_or_equal_fn, - {var_index, var_count}); + auto [var_condition] = builder.add_call<1>(greater_or_equal_fn, {var_index, var_count}); var_condition->set_name("condition"); MFProcedureBuilder::Branch branch = builder.add_branch(*var_condition); branch.branch_true.add_destruct(*var_condition); @@ -236,12 +235,12 @@ TEST(multi_function_procedure, Vectors) MFVariable *var_v1 = &builder.add_input_parameter(MFDataType::ForVector()); MFVariable *var_v2 = &builder.add_parameter(MFParamType::ForMutableVector(CPPType::get())); builder.add_call(extend_fn, {var_v1, var_v2}); - auto [var_constant] = builder.add_call_with_new_variables<1>(constant_5_fn); + auto [var_constant] = builder.add_call<1>(constant_5_fn); builder.add_call(append_fn, {var_v2, var_constant}); builder.add_destruct(*var_constant); builder.add_call(extend_fn, {var_v2, var_v1}); - auto [var_len] = builder.add_call_with_new_variables<1>(sum_elements_fn, {var_v2}); - auto [var_v3] = builder.add_call_with_new_variables<1>(create_range_fn, {var_len}); + auto [var_len] = builder.add_call<1>(sum_elements_fn, {var_v2}); + auto [var_v3] = builder.add_call<1>(create_range_fn, {var_len}); builder.add_destruct({var_v1, var_len}); builder.add_output_parameter(*var_v3); -- cgit v1.2.3