Changeset 3196

Timestamp:

02/16/08 01:32:13 (10 months ago)

Author:

DRK

Message:

Fixed Variant, and added some unit tests to make sure there aren't regressions. Closes #654

Files:

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

trunk/tango/core/Variant.d

@@ -273 +273 @@
-            else static if( isPointer!(T) )
-            {
-T
+value
-            }
-            else static if( isObject!(T) )
-            {
-T
+value
-            }
-            else
@@ -571 +571 @@
-        assert( v.isEmpty, v.type.toString );
-
+        // Test basic integer storage and implicit casting support
-        v = 42;
-        assert( v.isA!(int), v.type.toString );
@@ -580 +581 @@
-        assert( v.get!(ulong) == 42uL );
-
+        // Test clearing
-        v.clear;
-        assert( v.isA!(void), v.type.toString );
-        assert( v.isEmpty, v.type.toString );
-
+        // Test strings
-        v = "Hello, World!"c;
-        assert( v.isA!(char[]), v.type.toString );
@@ -589 +592 @@
-        assert( v.get!(char[]) == "Hello, World!" );
-
+        // Test array storage
-        v = [1,2,3,4,5];
-        assert( v.isA!(int[]), v.type.toString );
-        assert( v.get!(int[]) == [1,2,3,4,5] );
-
+        // Test pointer storage
+        v = &v;
+        assert( v.isA!(Variant*), v.type.toString );
+        assert( !v.isImplicitly!(int*), v.type.toString );
+        // NB: we *should* be able to implicitly cast any pointer to a void*;
+        // I'm just not sure how to do it right now.  This test will catch
+        // once it works, and remind us to switch the assert around.
+        assert( !v.isImplicitly!(void*), "see above comment in source" );
+        assert( v.get!(Variant*) == &v );
+
+        // Test object storage
+        {
+            scope o = new Object;
+            v = o;
+            assert( v.isA!(Object), v.type.toString );
+            assert( v.get!(Object) is o );
+        }
+
+        // Test doubles and implicit casting
-        v = 3.1413;
-        assert( v.isA!(double), v.type.toString );
@@ -599 +622 @@
-        assert( v.get!(double) == 3.1413 );
-
+        // Test storage transitivity
-        auto u = Variant(v);
-        assert( u.isA!(double), u.type.toString );
-        assert( u.get!(double) == 3.1413 );
-
+        // Test operators
-        v = 38;
-        assert( v + 4 == 42 );
@@ -628 +653 @@
-        assert( "abc" ~ Variant("def") == "abcdef" );
-
+        // Test op= operators
-        v = 38; v += 4; assert( v == 42 );
-        v = 38; v -= 4; assert( v == 34 );
@@ -641 +667 @@
-        v = "abc"; v ~= "def"; assert( v == "abcdef" );
-
+        // Test comparison
-        assert( Variant(0) < Variant(42) );
-        assert( Variant(42) > Variant(0) );
@@ -647 +674 @@
-        assert( Variant("bar") == Variant("bar") );
-        assert( Variant("foo") != Variant("bar") );
+
+        // Test variants as AA keys
-        {
-            auto v1 = Variant(42);
@@ -661 +690 @@
-            assert( hash[v3] == 2 );
-        }
+
+        // Test AA storage
-        {
-            int[char[]] hash;