[Bf-blender-cvs] [2892434cdf0] functions-experimental-refactor: improve naming

Jacques Lucke noreply at git.blender.org
Tue Oct 15 15:56:31 CEST 2019


Commit: 2892434cdf067070f7ac764eb7945f131fa56126
Author: Jacques Lucke
Date:   Tue Oct 8 11:08:13 2019 +0200
Branches: functions-experimental-refactor
https://developer.blender.org/rB2892434cdf067070f7ac764eb7945f131fa56126

improve naming

===================================================================

M	source/blender/blenkernel/BKE_cpp_types.h
M	source/blender/blenkernel/BKE_generic_array_ref.h
M	source/blender/blenkernel/BKE_tuple.h
M	source/blender/blenkernel/intern/cpp_function.cc
M	source/blender/blenkernel/intern/cpp_types.cc
M	source/blender/blenkernel/intern/generic_array_ref.cc

===================================================================

diff --git a/source/blender/blenkernel/BKE_cpp_types.h b/source/blender/blenkernel/BKE_cpp_types.h
index 940fc89e726..0ee9c45a4f2 100644
--- a/source/blender/blenkernel/BKE_cpp_types.h
+++ b/source/blender/blenkernel/BKE_cpp_types.h
@@ -8,7 +8,7 @@ namespace BKE {
 void init_data_types();
 void free_data_types();
 
-template<typename T> CPPType &get_cpp_type();
+template<typename T> CPPType &GET_TYPE();
 
 }  // namespace BKE
 
diff --git a/source/blender/blenkernel/BKE_generic_array_ref.h b/source/blender/blenkernel/BKE_generic_array_ref.h
index 274fca77a95..16f9abde3f1 100644
--- a/source/blender/blenkernel/BKE_generic_array_ref.h
+++ b/source/blender/blenkernel/BKE_generic_array_ref.h
@@ -37,7 +37,7 @@ class GenericArrayRef {
 
   template<typename T> ArrayRef<T> get_ref() const
   {
-    BLI_assert(get_cpp_type<T>().is_same_or_generalization(m_type));
+    BLI_assert(GET_TYPE<T>().is_same_or_generalization(m_type));
     return ArrayRef<T>((const T *)m_buffer, m_size);
   }
 };
@@ -68,7 +68,7 @@ class GenericMutableArrayRef {
 
   template<typename T> MutableArrayRef<T> get_ref()
   {
-    BLI_assert(get_cpp_type<T>().is_same_or_generalization(m_type));
+    BLI_assert(GET_TYPE<T>().is_same_or_generalization(m_type));
     return ArrayRef<T>((const T *)m_buffer, m_size);
   }
 };
@@ -101,8 +101,8 @@ class MutableArrayRefCPPType final : public CPPType {
   }
 };
 
-ArrayRefCPPType &get_generic_array_ref_cpp_type(CPPType &base);
-MutableArrayRefCPPType &get_generic_mutable_array_ref_cpp_type(CPPType &base);
+ArrayRefCPPType &GET_TYPE_generic_array_ref(CPPType &base);
+MutableArrayRefCPPType &GET_TYPE_generic_mutable_array_ref(CPPType &base);
 
 }  // namespace BKE
 
diff --git a/source/blender/blenkernel/BKE_tuple.h b/source/blender/blenkernel/BKE_tuple.h
index 8a50e8f66b3..d0c058b7358 100644
--- a/source/blender/blenkernel/BKE_tuple.h
+++ b/source/blender/blenkernel/BKE_tuple.h
@@ -86,7 +86,7 @@ class TupleInfo : BLI::NonCopyable, BLI::NonMovable {
   template<typename T> bool element_has_type(uint index) const
   {
     CPPType *expected_type = m_types[index];
-    CPPType *actual_type == get_cpp_type<T>();
+    CPPType *actual_type == GET_TYPE<T>();
     return expected_type == actual_type;
   }
 };
@@ -251,7 +251,7 @@ class TupleRef {
     return this->copy_out<T>(index);
   }
 
-  template<typename T> T get_cpp_type(uint index) const
+  template<typename T> T GET_TYPE(uint index) const
   {
     BLI_STATIC_ASSERT(std::is_trivial<T>::value, "can only be used with trivial types");
     return this->copy_out<T>(index);
diff --git a/source/blender/blenkernel/intern/cpp_function.cc b/source/blender/blenkernel/intern/cpp_function.cc
index fa1168ca6ef..98bf4f349d9 100644
--- a/source/blender/blenkernel/intern/cpp_function.cc
+++ b/source/blender/blenkernel/intern/cpp_function.cc
@@ -18,9 +18,9 @@ CPPFunction::~CPPFunction()
 class AddFloatsFunction : public CPPFunction {
   void signature(SignatureBuilderCPP &signature) override
   {
-    signature.add_input("A", get_cpp_type<float>());
-    signature.add_input("B", get_cpp_type<float>());
-    signature.add_output("Result", get_cpp_type<float>());
+    signature.add_input("A", GET_TYPE<float>());
+    signature.add_input("B", GET_TYPE<float>());
+    signature.add_output("Result", GET_TYPE<float>());
   }
 
   void call(TupleRef &fn_in, TupleRef &fn_out) const override
@@ -35,8 +35,8 @@ class AddFloatsFunction : public CPPFunction {
 class AddFloatsArray : public CPPFunction {
   void signature(SignatureBuilderCPP &signature) override
   {
-    signature.add_input("A", get_generic_array_ref_cpp_type(get_cpp_type<float>()));
-    signature.add_output("B", get_cpp_type<float>());
+    signature.add_input("A", GET_TYPE_generic_array_ref(GET_TYPE<float>()));
+    signature.add_output("B", GET_TYPE<float>());
   }
 
   void call(TupleRef &fn_in, TupleRef &fn_out) const override
diff --git a/source/blender/blenkernel/intern/cpp_types.cc b/source/blender/blenkernel/intern/cpp_types.cc
index 2baf92410ee..27ceb72e884 100644
--- a/source/blender/blenkernel/intern/cpp_types.cc
+++ b/source/blender/blenkernel/intern/cpp_types.cc
@@ -104,7 +104,7 @@ void init_data_types()
 }
 
 #define CPP_TYPE_GETTER(IDENTIFIER, TYPE_NAME) \
-  template<> CPPType &get_cpp_type<TYPE_NAME>() \
+  template<> CPPType &GET_TYPE<TYPE_NAME>() \
   { \
     return *TYPE_##IDENTIFIER; \
   }
diff --git a/source/blender/blenkernel/intern/generic_array_ref.cc b/source/blender/blenkernel/intern/generic_array_ref.cc
index 65e47b0a6e7..fdd48698f5b 100644
--- a/source/blender/blenkernel/intern/generic_array_ref.cc
+++ b/source/blender/blenkernel/intern/generic_array_ref.cc
@@ -25,7 +25,7 @@ BLI_LAZY_INIT_STATIC(MutableArrayRefTypeMapping, get_mutable_type_mapping)
 static std::mutex map_mutex__immutable;
 static std::mutex map_mutex__mutable;
 
-ArrayRefCPPType &get_generic_array_ref_cpp_type(CPPType &base)
+ArrayRefCPPType &GET_TYPE_generic_array_ref(CPPType &base)
 {
   std::lock_guard<std::mutex> lock(map_mutex__immutable);
 
@@ -38,7 +38,7 @@ ArrayRefCPPType &get_generic_array_ref_cpp_type(CPPType &base)
   return *type;
 }
 
-MutableArrayRefCPPType &get_generic_mutable_array_ref_cpp_type(CPPType &base)
+MutableArrayRefCPPType &GET_TYPE_generic_mutable_array_ref(CPPType &base)
 {
   std::lock_guard<std::mutex> lock(map_mutex__mutable);
 
@@ -54,7 +54,7 @@ MutableArrayRefCPPType &get_generic_mutable_array_ref_cpp_type(CPPType &base)
 
 ArrayRefCPPType::ArrayRefCPPType(CPPType &base_type)
     : CPPType("GenericArrayRef for " + base_type.name(),
-              get_cpp_type<GenericArrayRef>(),
+              GET_TYPE<GenericArrayRef>(),
               ArrayRefCPPType::ConstructDefaultCB),
       m_base_type(base_type)
 {
@@ -62,7 +62,7 @@ ArrayRefCPPType::ArrayRefCPPType(CPPType &base_type)
 
 MutableArrayRefCPPType::MutableArrayRefCPPType(CPPType &base_type)
     : CPPType("GenericMutableArrayRef for " + base_type.name(),
-              get_cpp_type<GenericMutableArrayRef>(),
+              GET_TYPE<GenericMutableArrayRef>(),
               MutableArrayRefCPPType::ConstructDefaultCB),
       m_base_type(base_type)
 {



More information about the Bf-blender-cvs mailing list