Merge pull request #97 from klickverbot/property

Strict @Property syntax compliance (-property)
dlang · Dec 2, 2011 · e419fc9 · e419fc9
2 parents 70f5abd + 6ce26bf
commit e419fc9
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/import/object.di b/import/object.di
@@ -459,7 +459,7 @@ void clear(T)(ref T obj) if (is(T == struct))
 {
     typeid(T).destroy(&obj);
     auto buf = (cast(ubyte*) &obj)[0 .. T.sizeof];
-    auto init = cast(ubyte[])typeid(T).init;
+    auto init = cast(ubyte[])typeid(T).init();
     if(init.ptr is null) // null ptr means initialize to 0s
         buf[] = 0;
     else

diff --git a/posix.mak b/posix.mak
@@ -27,8 +27,8 @@ IMPDIR=import
 
 MODEL=32
 
-DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport
-UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport
+DFLAGS=-m$(MODEL) -O -release -inline -nofloat -w -d -Isrc -Iimport -property
+UDFLAGS=-m$(MODEL) -O -release -nofloat -w -d -Isrc -Iimport -property
 
 CFLAGS=-m$(MODEL) -O
 

diff --git a/src/core/time.d b/src/core/time.d
@@ -2596,9 +2596,9 @@ public:
         auto fs = FracSec(12);
         const cfs = FracSec(12);
         immutable ifs = FracSec(12);
-        assert(fs.toString == "12 hnsecs");
-        assert(cfs.toString == "12 hnsecs");
-        assert(ifs.toString == "12 hnsecs");
+        assert(fs.toString() == "12 hnsecs");
+        assert(cfs.toString() == "12 hnsecs");
+        assert(ifs.toString() == "12 hnsecs");
     }
 
 

diff --git a/src/object_.d b/src/object_.d
@@ -924,7 +924,7 @@ class TypeInfo_Struct : TypeInfo
         return this is o ||
                 ((s = cast(TypeInfo_Struct)o) !is null &&
                  this.name == s.name &&
-                 this.init.length == s.init.length);
+                 this.init().length == s.init().length);
     }
 
     override hash_t getHash(in void* p)
@@ -938,7 +938,7 @@ class TypeInfo_Struct : TypeInfo
         else
         {
             debug(PRINTF) printf("getHash() using default hash\n");
-            return hashOf(p, init.length);
+            return hashOf(p, init().length);
         }
     }
 
@@ -952,7 +952,7 @@ class TypeInfo_Struct : TypeInfo
             return true;
         else
             // BUG: relies on the GC not moving objects
-            return memcmp(p1, p2, init.length) == 0;
+            return memcmp(p1, p2, init().length) == 0;
     }
 
     override int compare(in void* p1, in void* p2)
@@ -968,7 +968,7 @@ class TypeInfo_Struct : TypeInfo
                     return (*xopCmp)(p2, p1);
                 else
                     // BUG: relies on the GC not moving objects
-                    return memcmp(p1, p2, init.length);
+                    return memcmp(p1, p2, init().length);
             }
             else
                 return -1;
@@ -978,7 +978,7 @@ class TypeInfo_Struct : TypeInfo
 
     @property override size_t tsize() nothrow pure
     {
-        return init.length;
+        return init().length;
     }
 
     override void[] init() nothrow pure { return m_init; }
@@ -1153,7 +1153,7 @@ class TypeInfo_Const : TypeInfo
 
     @property override TypeInfo next() nothrow pure { return base.next; }
     @property override uint flags() nothrow pure { return base.flags; }
-    override void[] init() nothrow pure { return base.init; }
+    override void[] init() nothrow pure { return base.init(); }
 
     @property override size_t talign() nothrow pure { return base.talign(); }
 
@@ -2614,7 +2614,7 @@ version(unittest) unittest
                destroyed ++;
            }
        }
-       
+
        struct B
        {
            C c;

diff --git a/win32.mak b/win32.mak
@@ -6,8 +6,8 @@ CC=dmc
 DOCDIR=doc
 IMPDIR=import
 
-DFLAGS=-O -release -inline -nofloat -w -d -Isrc -Iimport
-UDFLAGS=-O -release -nofloat -w -d -Isrc -Iimport
+DFLAGS=-O -release -inline -nofloat -w -d -Isrc -Iimport -property
+UDFLAGS=-O -release -nofloat -w -d -Isrc -Iimport -property
 
 CFLAGS=