Renamed type_t to type.

compatibl-dev · compatibl-dev · commit 77ee6c3e577a · 2019-08-12T06:28:20.000-04:00
diff --git a/cpp/src/dotcpp-test/dot/test/system/enum_test_apples_sample.hpp b/cpp/src/dotcpp-test/dot/test/system/enum_test_apples_sample.hpp
@@ -44,9 +44,9 @@ namespace dot
     template <>
     struct type_traits<apples_sample>
     {
-        static type_t typeof()
+        static type typeof()
         {
-            static type_t result = make_type_builder<char>("dot", "apples_sample")->is_enum()->build();
+            static type result = make_type_builder<char>("dot", "apples_sample")->is_enum()->build();
             return result;
         }
     };
diff --git a/cpp/src/dotcpp-test/dot/test/system/enum_test_colors_sample.hpp b/cpp/src/dotcpp-test/dot/test/system/enum_test_colors_sample.hpp
@@ -44,9 +44,9 @@ namespace dot
     template <>
     struct type_traits<colors_sample>
     {
-        static type_t typeof()
+        static type typeof()
         {
-            static type_t result = make_type_builder<char>("dot", "colors_sample")->is_enum()->build();
+            static type result = make_type_builder<char>("dot", "colors_sample")->is_enum()->build();
             return result;
         }
     };
diff --git a/cpp/src/dotcpp-test/dot/test/system/reflection_test.cpp b/cpp/src/dotcpp-test/dot/test/system/reflection_test.cpp
@@ -53,10 +53,10 @@ namespace dot
             return 42 + param;
         }
 
-        type_t get_type() override
+        type get_type() override
         {
             // Converts to type_t with thread safety guarantee as per C++ Standard
-            static type_t result = []()->type_t
+            static type result = []()->type
             {
                 received << "Creating type_t (this should run only once)." << std::endl;
 
@@ -97,7 +97,7 @@ namespace dot
 
         object x = obj->count();
 
-        type_t result = obj->get_type();
+        type result = obj->get_type();
         list<property_info> props = type->get_properties();
         property_info int_prop = props[0];
         REQUIRE(int_prop->Name == "IntFld");
diff --git a/cpp/src/dotcpp-test/dot/test/system/serialization_test.cpp b/cpp/src/dotcpp-test/dot/test/system/serialization_test.cpp
@@ -54,11 +54,11 @@ namespace dot
 
     public: // STATIC
 
-        static type_t typeof()
+        static type typeof()
         {
-            static type_t result = []()-> type_t
+            static type result = []()-> type
             {
-                type_t t = make_type_builder<self>("System.Test", "sample_data_2")
+                type t = make_type_builder<self>("System.Test", "sample_data_2")
                     ->with_field("data_field", &self::data_field)
                     ->build();
 
@@ -68,7 +68,7 @@ namespace dot
             return result;
         }
 
-        type_t get_type() override
+        type get_type() override
         {
             return typeof();
         }
@@ -126,7 +126,7 @@ namespace dot
     {
         if (obj.is_empty()) return "";
 
-        type_t t = obj->get_type();
+        type t = obj->get_type();
 
         std::stringstream ss;
 
@@ -168,7 +168,7 @@ namespace dot
 
         string s = obj_to_string(obj);
 
-        type_t t = obj->get_type();
+        type t = obj->get_type();
 
         sample_data dt = (sample_data)activator::create_instance(obj->get_type());
 
diff --git a/cpp/src/dotcpp/dot/detail/enum_macro.hpp b/cpp/src/dotcpp/dot/detail/enum_macro.hpp
@@ -36,12 +36,12 @@ public:                                                                 \
     operator int() const { return value_; }                             \
     self& operator=(int rhs) { value_ = rhs; return *this; }            \
     self& operator=(const self& other) { value_ = other.value_; return *this; } \
-    virtual dot::type_t get_type() { return typeof(); }                         \
-    static dot::type_t typeof()                                                \
+    virtual dot::type get_type() { return typeof(); }                         \
+    static dot::type typeof()                                                \
     {                                                                   \
-        static dot::type_t result = []()->dot::type_t                                   \
+        static dot::type result = []()->dot::type                                   \
         {                                                               \
-            dot::type_t t = dot::make_type_builder<self>(nspace, name)             \
+            dot::type t = dot::make_type_builder<self>(nspace, name)             \
                 ->is_enum()                                              \
                 ->with_constructor(&self::make_self, {})                  \
                 ->with_base<enum_base>()                                      \
diff --git a/cpp/src/dotcpp/dot/detail/reflection_macro.hpp b/cpp/src/dotcpp/dot/detail/reflection_macro.hpp
@@ -26,12 +26,12 @@ limitations under the License.
 
 #define DOT_TYPE_BEGIN(nspace, name, ...)                                                         \
         public:                                                                                   \
-        virtual dot::type_t get_type() { return typeof(); }                                               \
-        static dot::type_t typeof()                                                                      \
+        virtual dot::type get_type() { return typeof(); }                                               \
+        static dot::type typeof()                                                                      \
         {                                                                                         \
-            static dot::type_t result = []()-> dot::type_t                                                        \
+            static dot::type result = []()-> dot::type                                                        \
             {                                                                                     \
-                dot::type_t t = dot::make_type_builder<self>(nspace, name)
+                dot::type t = dot::make_type_builder<self>(nspace, name)
 
 #define DOT_TYPE_END()                                                                         \
                     ->build();                                                                    \
diff --git a/cpp/src/dotcpp/dot/system/bool.cpp b/cpp/src/dotcpp/dot/system/bool.cpp
@@ -54,12 +54,12 @@ namespace dot
         return value_ ? bool_impl::true_string : bool_impl::false_string;
     }
 
-    type_t bool_impl::typeof()
+    type bool_impl::typeof()
     {
         return dot::typeof<bool>();
     }
 
-    type_t bool_impl::get_type()
+    type bool_impl::get_type()
     {
         return typeof();
     }
diff --git a/cpp/src/dotcpp/dot/system/bool.hpp b/cpp/src/dotcpp/dot/system/bool.hpp
@@ -66,8 +66,8 @@ namespace dot
         /// Converts the value of this instance to its equivalent string representation (either "True" or "False").
         virtual string to_string() override;
 
-        static type_t typeof();
-        type_t get_type() override;
+        static type typeof();
+        type get_type() override;
     };
 
 }
diff --git a/cpp/src/dotcpp/dot/system/char.cpp b/cpp/src/dotcpp/dot/system/char.cpp
@@ -51,12 +51,12 @@ namespace dot
         return std::to_string(value_);
     }
 
-    type_t char_impl::typeof()
+    type char_impl::typeof()
     {
         return dot::typeof<char>();
     }
 
-    type_t char_impl::get_type()
+    type char_impl::get_type()
     {
         return typeof();
     }
diff --git a/cpp/src/dotcpp/dot/system/char.hpp b/cpp/src/dotcpp/dot/system/char.hpp
@@ -65,7 +65,7 @@ namespace dot
         /// Converts the numeric value of this instance to its equivalent string representation.
         virtual string to_string() override;
 
-        static type_t typeof();
-        type_t get_type() override;
+        static type typeof();
+        type get_type() override;
     };
 }
diff --git a/cpp/src/dotcpp/dot/system/collections/generic/list.hpp b/cpp/src/dotcpp/dot/system/collections/generic/list.hpp
@@ -139,8 +139,8 @@ namespace dot
 
     public: // REFLECTION
 
-        virtual type_t get_type() { return typeof(); }
-        static type_t typeof();
+        virtual type get_type() { return typeof(); }
+        static type typeof();
     };
 
     /// Create empty list with default initial capacity.
diff --git a/cpp/src/dotcpp/dot/system/collections/list_base.cpp b/cpp/src/dotcpp/dot/system/collections/list_base.cpp
@@ -28,14 +28,14 @@ limitations under the License.
 
 namespace dot
 {
-    type_t list_base_impl::typeof()
+    type list_base_impl::typeof()
     {
-        static type_t type_ = make_type_builder<list_base_impl>("System.Collections", "ListBase")
+        static type type_ = make_type_builder<list_base_impl>("System.Collections", "ListBase")
             ->build();
         return type_;
     }
 
-    type_t list_base_impl::get_type()
+    type list_base_impl::get_type()
     {
         return typeof();
     }
diff --git a/cpp/src/dotcpp/dot/system/collections/list_base.hpp b/cpp/src/dotcpp/dot/system/collections/list_base.hpp
@@ -49,10 +49,10 @@ namespace dot
         virtual int get_length() = 0;
 
         /// Gets the type_t of the current instance.
-        type_t get_type() override;
+        type get_type() override;
 
         /// Gets the type_t of the collection_base_impl.
-        static type_t typeof();
+        static type typeof();
 
     };
 
diff --git a/cpp/src/dotcpp/dot/system/double.cpp b/cpp/src/dotcpp/dot/system/double.cpp
@@ -51,12 +51,12 @@ namespace dot
         return std::to_string(value_);
     }
 
-    type_t double_impl::typeof()
+    type double_impl::typeof()
     {
         return dot::typeof<double>();
     }
 
-    type_t double_impl::get_type()
+    type double_impl::get_type()
     {
         return typeof();
     }
diff --git a/cpp/src/dotcpp/dot/system/double.hpp b/cpp/src/dotcpp/dot/system/double.hpp
@@ -65,8 +65,8 @@ namespace dot
 
     public: // REFLECTION
 
-        static type_t typeof();
-        type_t get_type() override;
+        static type typeof();
+        type get_type() override;
     };
 
 }
diff --git a/cpp/src/dotcpp/dot/system/enum.cpp b/cpp/src/dotcpp/dot/system/enum.cpp
@@ -57,7 +57,7 @@ namespace dot
         return false;
     }
 
-    object enum_base::parse(type_t enumType, string value)
+    object enum_base::parse(type enumType, string value)
     {
         object enum_obj = activator::create_instance(enumType);
         enum_base* en = dynamic_cast<enum_base*>(enum_obj.operator->());
diff --git a/cpp/src/dotcpp/dot/system/enum.hpp b/cpp/src/dotcpp/dot/system/enum.hpp
@@ -75,7 +75,7 @@ namespace dot
 
         /// Converts the string representation of the name or numeric value of
         /// one or more enumerated constants to an equivalent enumerated object.
-        static object parse(type_t enumType, string value);
+        static object parse(type enumType, string value);
 
     protected: // PROTECTED
 
diff --git a/cpp/src/dotcpp/dot/system/enum_impl.hpp b/cpp/src/dotcpp/dot/system/enum_impl.hpp
@@ -74,7 +74,7 @@ namespace dot
 
     public: // REFLECTION
 
-        static type_t typeof() { return dot::typeof<T>(); }
-        type_t get_type() override { return typeof(); }
+        static type typeof() { return dot::typeof<T>(); }
+        type get_type() override { return typeof(); }
     };
 }
diff --git a/cpp/src/dotcpp/dot/system/int.cpp b/cpp/src/dotcpp/dot/system/int.cpp
@@ -51,12 +51,12 @@ namespace dot
         return std::to_string(value_);
     }
 
-    type_t int_impl::typeof()
+    type int_impl::typeof()
     {
         return dot::typeof<int>();
     }
 
-    type_t int_impl::get_type()
+    type int_impl::get_type()
     {
         return typeof();
     }
diff --git a/cpp/src/dotcpp/dot/system/int.hpp b/cpp/src/dotcpp/dot/system/int.hpp
@@ -60,8 +60,8 @@ namespace dot
         /// Converts the numeric value of this instance to its equivalent string representation.
         virtual string to_string() override;
 
-        static type_t typeof();
-        type_t get_type() override;
+        static type typeof();
+        type get_type() override;
     };
 
 }
diff --git a/cpp/src/dotcpp/dot/system/long.cpp b/cpp/src/dotcpp/dot/system/long.cpp
@@ -51,12 +51,12 @@ namespace dot
         return std::to_string(value_);
     }
 
-    type_t long_impl::typeof()
+    type long_impl::typeof()
     {
         return dot::typeof<int64_t>();
     }
 
-    type_t long_impl::get_type()
+    type long_impl::get_type()
     {
         return typeof();
     }
diff --git a/cpp/src/dotcpp/dot/system/long.hpp b/cpp/src/dotcpp/dot/system/long.hpp
@@ -60,8 +60,8 @@ namespace dot
         /// Converts the numeric value of this instance to its equivalent string representation.
         virtual string to_string() override;
 
-        static type_t typeof();
-        type_t get_type() override;
+        static type typeof();
+        type get_type() override;
     };
 
 }
diff --git a/cpp/src/dotcpp/dot/system/object.hpp b/cpp/src/dotcpp/dot/system/object.hpp
@@ -39,7 +39,7 @@ namespace dot
     template <class T> class enum_impl;
     template <class T> class struct_wrapper_impl;
     template <class T> using struct_wrapper = ptr<struct_wrapper_impl<T>>;
-    template <class T> type_t typeof();
+    template <class T> type typeof();
 
     namespace detail
     {
@@ -256,12 +256,12 @@ namespace dot
         struct_wrapper_impl(const T& value) : T(value) {}
 
     public:
-        static type_t typeof()
+        static type typeof()
         {
             return ::dot::typeof<T>();
         }
 
-        type_t get_type() override
+        type get_type() override
         {
             return typeof();
         }
diff --git a/cpp/src/dotcpp/dot/system/object_impl.hpp b/cpp/src/dotcpp/dot/system/object_impl.hpp
@@ -30,7 +30,7 @@ namespace dot
 {
     class object;
     class string_impl; class string;
-    class type_impl; using type_t = ptr<type_impl>;
+    class type_impl; using type = ptr<type_impl>;
 
     /// All classes with reference semantics should derive from this type.
     /// It works with ptr to provide an emulation of reference semantics in C++.
@@ -58,10 +58,10 @@ namespace dot
         virtual size_t hash_code();
 
         /// Gets the type_t of the current instance.
-        virtual type_t get_type();
+        virtual type get_type();
 
         /// Gets the type_t of the class.
-        static type_t typeof();
+        static type typeof();
 
         /// string that represents the current object.
         ///
diff --git a/cpp/src/dotcpp/dot/system/reflection/activator.cpp b/cpp/src/dotcpp/dot/system/reflection/activator.cpp
@@ -33,12 +33,12 @@ limitations under the License.
 
 namespace dot
 {
-    object activator::create_instance(type_t t)
+    object activator::create_instance(type t)
     {
         return create_instance(t, nullptr);
     }
 
-    object activator::create_instance(type_t t, list<object> params)
+    object activator::create_instance(type t, list<object> params)
     {
         list<constructor_info> ctors = t->get_constructors();
 
diff --git a/cpp/src/dotcpp/dot/system/reflection/activator.hpp b/cpp/src/dotcpp/dot/system/reflection/activator.hpp
@@ -41,10 +41,10 @@ namespace dot
     public: // METHODS
 
         /// Creates an instance of the specified type using that type's default constructor.
-        static object create_instance(type_t t);
+        static object create_instance(type t);
 
         /// Creates an instance of the specified type using the constructor that best matches the specified parameters.
-        static object create_instance(type_t t, list<object> params);
+        static object create_instance(type t, list<object> params);
 
         /// Creates an instance of the type whose name is specified, using the named assembly and default constructor.
         static object create_instance(string assembly_name, string type_name);
diff --git a/cpp/src/dotcpp/dot/system/reflection/constructor_info.hpp b/cpp/src/dotcpp/dot/system/reflection/constructor_info.hpp
diff --git a/cpp/src/dotcpp/dot/system/reflection/field_info.hpp b/cpp/src/dotcpp/dot/system/reflection/field_info.hpp
diff --git a/cpp/src/dotcpp/dot/system/reflection/member_info.hpp b/cpp/src/dotcpp/dot/system/reflection/member_info.hpp
diff --git a/cpp/src/dotcpp/dot/system/reflection/method_info.hpp b/cpp/src/dotcpp/dot/system/reflection/method_info.hpp
diff --git a/cpp/src/dotcpp/dot/system/reflection/parameter_info.hpp b/cpp/src/dotcpp/dot/system/reflection/parameter_info.hpp
diff --git a/cpp/src/dotcpp/dot/system/string.cpp b/cpp/src/dotcpp/dot/system/string.cpp
diff --git a/cpp/src/dotcpp/dot/system/string.hpp b/cpp/src/dotcpp/dot/system/string.hpp
diff --git a/cpp/src/dotcpp/dot/system/type.cpp b/cpp/src/dotcpp/dot/system/type.cpp
diff --git a/cpp/src/dotcpp/dot/system/type.hpp b/cpp/src/dotcpp/dot/system/type.hpp

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@ namespace dot`
`44`	`44`	`template <>`
`45`	`45`	`struct type_traits<apples_sample>`
`46`	`46`	`{`
`47`		`- static type_t typeof()`
	`47`	`+ static type typeof()`
`48`	`48`	`{`
`49`		`- static type_t result = make_type_builder<char>("dot", "apples_sample")->is_enum()->build();`
	`49`	`+ static type result = make_type_builder<char>("dot", "apples_sample")->is_enum()->build();`
`50`	`50`	`return result;`
`51`	`51`	`}`
`52`	`52`	`};`
Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,10 @@ namespace dot`
`53`	`53`	`return 42 + param;`
`54`	`54`	`}`
`55`	`55`
`56`		`- type_t get_type() override`
	`56`	`+ type get_type() override`
`57`	`57`	`{`
`58`	`58`	`// Converts to type_t with thread safety guarantee as per C++ Standard`
`59`		`- static type_t result = []()->type_t`
	`59`	`+ static type result = []()->type`
`60`	`60`	`{`
`61`	`61`	`received << "Creating type_t (this should run only once)." << std::endl;`
`62`	`62`
`@@ -97,7 +97,7 @@ namespace dot`
`97`	`97`
`98`	`98`	`object x = obj->count();`
`99`	`99`
`100`		`- type_t result = obj->get_type();`
	`100`	`+ type result = obj->get_type();`
`101`	`101`	`list<property_info> props = type->get_properties();`
`102`	`102`	`property_info int_prop = props[0];`
`103`	`103`	`REQUIRE(int_prop->Name == "IntFld");`
Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,11 @@ namespace dot`
`54`	`54`
`55`	`55`	`public: // STATIC`
`56`	`56`
`57`		`- static type_t typeof()`
	`57`	`+ static type typeof()`
`58`	`58`	`{`
`59`		`- static type_t result = []()-> type_t`
	`59`	`+ static type result = []()-> type`
`60`	`60`	`{`
`61`		`- type_t t = make_type_builder<self>("System.Test", "sample_data_2")`
	`61`	`+ type t = make_type_builder<self>("System.Test", "sample_data_2")`
`62`	`62`	`->with_field("data_field", &self::data_field)`
`63`	`63`	`->build();`
`64`	`64`
`@@ -68,7 +68,7 @@ namespace dot`
`68`	`68`	`return result;`
`69`	`69`	`}`
`70`	`70`
`71`		`- type_t get_type() override`
	`71`	`+ type get_type() override`
`72`	`72`	`{`
`73`	`73`	`return typeof();`
`74`	`74`	`}`
`@@ -126,7 +126,7 @@ namespace dot`
`126`	`126`	`{`
`127`	`127`	`if (obj.is_empty()) return "";`
`128`	`128`
`129`		`- type_t t = obj->get_type();`
	`129`	`+ type t = obj->get_type();`
`130`	`130`
`131`	`131`	`std::stringstream ss;`
`132`	`132`
`@@ -168,7 +168,7 @@ namespace dot`
`168`	`168`
`169`	`169`	`string s = obj_to_string(obj);`
`170`	`170`
`171`		`- type_t t = obj->get_type();`
	`171`	`+ type t = obj->get_type();`
`172`	`172`
`173`	`173`	`sample_data dt = (sample_data)activator::create_instance(obj->get_type());`
`174`	`174`
Original file line number	Diff line number	Diff line change
`@@ -54,12 +54,12 @@ namespace dot`
`54`	`54`	`return value_ ? bool_impl::true_string : bool_impl::false_string;`
`55`	`55`	`}`
`56`	`56`
`57`		`- type_t bool_impl::typeof()`
	`57`	`+ type bool_impl::typeof()`
`58`	`58`	`{`
`59`	`59`	`return dot::typeof<bool>();`
`60`	`60`	`}`
`61`	`61`
`62`		`- type_t bool_impl::get_type()`
	`62`	`+ type bool_impl::get_type()`
`63`	`63`	`{`
`64`	`64`	`return typeof();`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,8 +66,8 @@ namespace dot`
`66`	`66`	`/// Converts the value of this instance to its equivalent string representation (either "True" or "False").`
`67`	`67`	`virtual string to_string() override;`
`68`	`68`
`69`		`- static type_t typeof();`
`70`		`- type_t get_type() override;`
	`69`	`+ static type typeof();`
	`70`	`+ type get_type() override;`
`71`	`71`	`};`
`72`	`72`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,12 @@ namespace dot`
`51`	`51`	`return std::to_string(value_);`
`52`	`52`	`}`
`53`	`53`
`54`		`- type_t char_impl::typeof()`
	`54`	`+ type char_impl::typeof()`
`55`	`55`	`{`
`56`	`56`	`return dot::typeof<char>();`
`57`	`57`	`}`
`58`	`58`
`59`		`- type_t char_impl::get_type()`
	`59`	`+ type char_impl::get_type()`
`60`	`60`	`{`
`61`	`61`	`return typeof();`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ namespace dot`
`65`	`65`	`/// Converts the numeric value of this instance to its equivalent string representation.`
`66`	`66`	`virtual string to_string() override;`
`67`	`67`
`68`		`- static type_t typeof();`
`69`		`- type_t get_type() override;`
	`68`	`+ static type typeof();`
	`69`	`+ type get_type() override;`
`70`	`70`	`};`
`71`	`71`	`}`