update

Author: Jomixedyu

CoreLib.Serialization/JsonSerializer.cpp

@@ -40,9 +40,9 @@ namespace JxCoreLib::Serialization
             return enum_js;
         }
 
-        if (obj->GetType()->is_custom_primitive_type())
+        if (IStringify* stringify = interface_cast<IStringify>(obj))
         {
-            return json(obj->ToString());
+            return json(stringify->IStringify_Stringify());
         }
 
         //list
@@ -206,15 +206,16 @@ namespace JxCoreLib::Serialization
             return _DeserializeEnum(js, type);
         }
 
-        if (type->is_custom_primitive_type())
+        if (type->IsImplementedInterface(cltypeof<IStringify>()))
         {
             if (!js.is_string()) return nullptr;
             sptr<Object> obj = default_v;
             if (default_v == nullptr)
             {
                 obj = type->CreateSharedInstance({});
             }
-            sptr_cast<CustomPrimitiveObject>(obj)->Parse(js.get<string>());
+
+            interface_cast<IStringify>(obj.get())->IStringify_Parse(js.get<string>());
             return obj;
         }
 

CoreLib/BasicTypes.h

@@ -11,13 +11,12 @@ namespace JxCoreLib
 
     };
 
-    class CustomPrimitiveObject : public BoxingObject
+    class IStringify : public IInterface
     {
-        CORELIB_DEF_TYPE(AssemblyObject_JxCoreLib, JxCoreLib::CustomPrimitiveObject, BoxingObject);
+        CORELIB_DEF_INTERFACE(AssemblyObject_JxCoreLib, JxCoreLib::IStringify, IInterface);
 
-    public:
-        virtual void Parse(const string& value) = 0;
-        //override Parse and ToString
+        virtual void IStringify_Parse(const string& value) = 0;
+        virtual string IStringify_Stringify() = 0;
     };
 
     class PrimitiveObject : public BoxingObject

CoreLib/Guid.h

@@ -25,18 +25,21 @@ namespace JxCoreLib
         static guid_t empty() { return guid_t(); }
     };
 
-    class Guid : public CustomPrimitiveObject
+    class Guid : public BoxingObject, public IStringify
     {
-        CORELIB_DEF_TYPE(AssemblyObject_JxCoreLib, JxCoreLib::Guid, CustomPrimitiveObject);
+        CORELIB_DEF_TYPE(AssemblyObject_JxCoreLib, JxCoreLib::Guid, BoxingObject);
+        CORELIB_IMPL_INTERFACES(IStringify);
     public:
         using unboxing_type = guid_t;
         guid_t get_unboxing_value() const { return this->value_; }
 
         Guid() {}
         Guid(guid_t guid) : value_(guid) {}
         virtual string ToString() const override { return this->value_.to_string(); }
-        virtual void Parse(const string& value) override { this->value_ = guid_t::parse(value); };
-    private:
+    public: /*Interfaces*/
+        virtual void IStringify_Parse(const string& value) override { this->value_ = guid_t::parse(value); }
+        virtual string IStringify_Stringify() override { return this->ToString(); }
+    private: /*Fields*/
         guid_t value_;
     };
     CORELIB_DECL_SHORTSPTR(Guid);

CoreLib/Type.cpp

@@ -98,12 +98,6 @@ namespace JxCoreLib
         return this->IsSubclassOf(cltypeof<BoxingObject>());
     }
 
-    bool Type::is_custom_primitive_type() const
-    {
-        return this->IsSubclassOf(cltypeof<CustomPrimitiveObject>());
-    }
-
-
     void Type::get_memberinfos(array_list<MemberInfo*>& out, TypeBinding attr)
     {
         for (auto& [name, info] : this->member_infos_)

CoreLib/Type.h

@@ -285,7 +285,6 @@ namespace JxCoreLib
         const std::type_info& get_typeinfo() const { return this->typeinfo_; }
         bool is_primitive_type() const;
         bool is_boxing_type() const;
-        bool is_custom_primitive_type() const;
         bool is_interface() const { return this->is_interface_; }
         bool is_enum() const { return this->enum_getter_; }
     public:
@@ -351,9 +350,9 @@ namespace JxCoreLib
 
         IInterface_sp GetSharedInterface(Object_rsp instance, Type* type)
         {
-            for (auto& [type, func, sfunc] : this->interfaces_)
+            for (auto& [ty, func, sfunc] : this->interfaces_)
             {
-                if (type == type)
+                if (ty == type)
                 {
                     return sfunc(instance);
                 }
@@ -362,9 +361,9 @@ namespace JxCoreLib
         }
         IInterface* GetInterface(Object* instance, Type* type)
         {
-            for (auto& [type, func, sfunc] : this->interfaces_)
+            for (auto& [ty, func, sfunc] : this->interfaces_)
             {
-                if (type == type)
+                if (ty == type)
                 {
                     return func(instance);
                 }

JxCode.CoreLib.cpp

@@ -25,10 +25,10 @@ extern void TestGuid();
 extern void TestMath();
 extern void TestPlatform();
 
-
 int main()
 {
     using namespace std;
+
     TestOOP();
     TestEnum();
     TestProperty();