Changeset 3898

Timestamp:

08/20/08 14:07:55 (4 months ago)

Author:

larsivi

Message:

Make Variant use Traits where applicable, fixes broken unittest and removes some duplication.

Files:

• trunk/tango/core/Variant.d (modified) (8 diffs)

trunk/tango/core/Variant.d

@@ -9 +9 @@
-
-private import tango.core.Vararg : va_list;
+private import tango.core.Traits;
-
-private
@@ -71 +72 @@
-    }
-
-    template isArray(T)
-    {
-        static if( is( T U : U[] ) )
-            const isArray = true;
-        else
-            const isArray = false;
-    }
-
-    template isPointer(T)
-    {
-        static if( is( T U : U* ) )
-            const isPointer = true;
-        else
-            const isPointer = false;
-    }
-
-    template isObject(T)
-    {
@@ -101 +86 @@
-        else
-            const isInterface = false;
-    }
-
-    template isStaticArray(T)
-    {
-        static if( is( typeof(T.init)[(T).sizeof / typeof(T.init).sizeof] == T ) )
-            const isStaticArray = true;
-        else
-            const isStaticArray = false;
-    }
-
@@ -194 +171 @@
-    template storageT(T)
-    {
-
+Type
-            alias typeof(T.dup) storageT;
-        else
@@ -241 +218 @@
-        Variant _this;
-
-
+Type
-            _this = value.dup;
-
@@ -262 +239 @@
-    Variant opAssign(T)(T value)
-    {
-
+Type
-        {
-            return (*this = value.dup);
@@ -274 +251 @@
-                mixin("this.value._"~T.stringof~"=value;");
-            }
-Array
+DynamicArrayType
-            {
-                this.value.arr = (cast(void*)value.ptr)
-                    [0 .. value.length];
-            }
-
+Type
-            {
-                this.value.ptr = cast(void*)value;
@@ -414 +391 @@
-            }
-        }
-Array
+DynamicArrayType
-        {
-            return (cast(typeof(T[0])*)this.value.arr.ptr)
-                [0 .. this.value.arr.length];
-        }
-
+Type
-        {
-            return cast(T)this.value.ptr;