Changeset 57 for trunk

Timestamp:

05/29/13 22:25:30 (12 years ago)

Author:

epyon

Message:

• nv/object - object class added with implementation and type registration
• nv/types - container support (currently only storage and detection)

Location:

trunk

Files:

• nv/object.hh (added)
• nv/types.hh (modified) (7 diffs)
• src/object.cc (added)

trunk/nv/types.hh

@@ -8 +8 @@
 #include <glm/glm.hpp>
 #include <nv/common.hh>
+#include <nv/object.hh>
 #include <type_traits>
 #include <utility>
@@ -14 +15 @@
 #include <string>
 
+#define NV_REGISTER_NAME( s ) template <> inline const char* nv::get_type_name<s>   () { return #s; }
+
 namespace nv
 {
+
         enum type
         {
@@ -95 +99 @@
     inline const char* get_type_name()
     {
-        static_assert< FALSE >( "Type not implemented!" );
+        static_assert( false, "Type not implemented!" );
     }
-
-#define NV_REGISTER_NAME( s ) template <> inline const char* nv::get_type_name<s>   () { return #s; }
 
         template <> inline const char* get_type_name<int>   () { return "sint"; }
@@ -130 +132 @@
 
         template <> inline const char* get_type_name<std::string> () { return "string"; }
+        template <> inline const char* get_type_name<object>      () { return "object"; }
+
+        template<typename T>
+        struct is_container
+        {
+        private:
+                typedef char                      yes;
+                typedef struct { char array[2]; } no;
+                template<typename C> static yes test(typename C::iterator*);
+                template<typename C> static no  test(...);
+        public:
+                static const bool value = sizeof(test<T>(0)) == sizeof(yes);
+        };
+
+        template<>
+        struct is_container< std::string > {
+                static const bool value = false;
+        };
+
 
         template <typename TYPE>
@@ -170 +191 @@
         struct type_entry;
 
+        enum type_flag
+        {
+                TF_POINTER      = 0x01, //< field is a pointer
+                TF_NOSERIALIZE  = 0x02, //< ignore during serialization
+                TF_INVISIBLE    = 0x04, //< field invisible to API
+                TF_READONLY     = 0x08, //< read only field
+                TF_SIMPLETYPE   = 0x10, //< raw binary I/O possible
+                TF_OWNED        = 0x20,
+                TF_CONTAINER    = 0x40, //< is a container
+        };
+
         struct type_field
         {
-                enum flags
-                {
-                        FPOINTER      = 0x01, //< field is a pointer
-                        FNOSERIALIZE  = 0x02, //< ignore during serialization
-                        FINVISIBLE    = 0x04, //< field invisible to API
-                        FREADONLY     = 0x08, //< read only field
-                        FSIMPLETYPE   = 0x10, //< raw binary I/O possible
-                        FOWNED        = 0x20,
-                };
                 hash_string  name;      //< name of the field
                 hash_string  type_name; //< name of the type of the field
@@ -187 +210 @@
                 size_t       offset;
 
-                template< typename TOBJECT, typename TFIELD>
-                type_field( hash_string name, TFIELD TOBJECT::*field )
+                template< typename TOBJECT, typename TFIELD >
+                type_field( hash_string name, TFIELD TOBJECT::*field, typename std::enable_if< is_container<TFIELD>::value, void* >::type = nullptr )
+                        : name(name)
+                        , type_name( get_type_name< std::remove_pointer<TFIELD::value_type>::type >() )
+                        , type( nullptr )
+                        , flags( 0 )
+                        , offset( offsetof( TOBJECT, *field ) )
+                        // NOTE: if offsetof behaves badly, check offset_of in common.hh
+                {
+                        flags = FCONTAINER |
+                                ( std::is_pointer<TFIELD::value_type>::value ? FPOINTER : 0 ) |
+                                ( std::is_pod<TFIELD::value_type>::value ? FSIMPLETYPE : 0 );
+                }
+
+                template< typename TOBJECT, typename TFIELD >
+                type_field( hash_string name, TFIELD TOBJECT::*field, typename std::enable_if< !is_container<TFIELD>::value, void* >::type = nullptr )
                         : name(name)
                         , type_name( get_type_name< std::remove_pointer<TFIELD>::type >() )
@@ -199 +236 @@
                                 ( std::is_pointer<TFIELD>::value ? FPOINTER : 0 ) |
                                 ( std::is_pod<TFIELD>::value ? FSIMPLETYPE : 0 );
+                }
+
+                type_field& flag( unsigned int f )
+                {
+                        flags |= f;
+                        return *this;
                 }
         };