Changeset 3725

Timestamp:

07/08/08 13:40:55 (5 months ago)

Author:

keinfarbton

Message:

Merged DMD 2.015

Files:

• branches/experimental/D2.0/lib/common/tango/core/Exception.d (modified) (1 diff)
• branches/experimental/D2.0/lib/common/tango/core/Thread.d (modified) (10 diffs)
• branches/experimental/D2.0/lib/compiler/dmd/aaA.d (modified) (2 diffs)
• branches/experimental/D2.0/lib/compiler/dmd/arrayassign.d (added)
• branches/experimental/D2.0/lib/compiler/dmd/typeinfo/ti_Aint.d (modified) (1 diff)
• branches/experimental/D2.0/lib/compiler/dmd/typeinfo/ti_C.d (modified) (1 diff)
• branches/experimental/D2.0/object.di (modified) (3 diffs)

branches/experimental/D2.0/lib/common/tango/core/Exception.d

@@ -116 +116 @@
- * Thrown on call to hidden func
- */
-Traced
+
-{
-    this( ClassInfo ci )

branches/experimental/D2.0/lib/common/tango/core/Thread.d

@@ -544 +544 @@
-            //       a race condition with isRunning.  The operation is labeled
-            //       volatile to prevent compiler reordering.
-volatile
+/+volatile+/
-            CloseHandle( m_hndl );
-            m_hndl = m_hndl.init;
@@ -556 +556 @@
-            //       to zero ensures that pthread_detach will not be called
-            //       on object destruction.
-volatile
+/+volatile+/
-        }
-        if( rethrow && m_unhandled )
@@ -670 +670 @@
-     * the process.
-     */
-final
+const
-
-
@@ -679 +679 @@
-     * the process.
-     */
-final
+const
-
-
@@ -2291 +2291 @@
-    }
-
-final
+const
-}
-
@@ -2334 +2334 @@
-
-        assert( Thread.getThis().m_curr is obj.m_ctxt );
-volatile
+/+volatile+/
-        obj.m_ctxt.tstack = obj.m_ctxt.bstack;
-        obj.m_state = Fiber.State.EXEC;
@@ -3201 +3201 @@
-        //       successive pop operations will succeed.
-        *oldp = getStackTop();
-volatile
+/+volatile+/
-        tobj.pushContext( m_ctxt );
-
@@ -3209 +3209 @@
-        //       to prevent Bad Things from happening.
-        tobj.popContext();
-volatile
+/+volatile+/
-        tobj.m_curr.tstack = tobj.m_curr.bstack;
-    }
@@ -3235 +3235 @@
-        //       successive pop operations will succeed.
-        *oldp = getStackTop();
-volatile
+/+volatile+/
-
-        fiber_switchContext( oldp, newp );
@@ -3241 +3241 @@
-        // NOTE: As above, these operations must be performed in a strict order
-        //       to prevent Bad Things from happening.
-volatile
+/+volatile+/
-        tobj.m_curr.tstack = tobj.m_curr.bstack;
-    }

branches/experimental/D2.0/lib/compiler/dmd/aaA.d

@@ -250 +250 @@
-body
-{
+    //printf("aaGet()\n");
-    auto pkey = cast(void *)(&valuesize + 1);
-    size_t i;
-    aaA *e;
-    auto keysize = aligntsize(keyti.tsize());
+    //printf("keysize = %d\n", keysize);
-
-    if (!aa.a)
@@ -577 +579 @@
-                    break;
-            }
+        //printf("rehash %d x%x\n", len, len);
-            len = prime_list[i];
-            newb.b = new aaA*[len];

branches/experimental/D2.0/lib/compiler/dmd/typeinfo/ti_Aint.d

@@ -73 +73 @@
-}
-
+unittest
+{
+    int[][] a = [[5,3,8,7], [2,5,3,8,7]];
+    a.sort;
+    assert(a == [[2,5,3,8,7], [5,3,8,7]]);
+
+    a = [[5,3,8,7], [5,3,8]];
+    a.sort;
+    assert(a == [[5,3,8], [5,3,8,7]]);
+}
+
-// uint[]
-

branches/experimental/D2.0/lib/compiler/dmd/typeinfo/ti_C.d

@@ -1 +1 @@
-/*
-5
+8
- *  Written by Walter Bright
- *

branches/experimental/D2.0/object.di

@@ -81 +81 @@
-    // 1:    // has possible pointers into GC memory
-    OffsetTypeInfo[] offTi();
+    void destroy(void *p);
+    void postblit(void *p);
-}
-
@@ -149 +151 @@
-
-    const(MemberInfo[]) function(Cutf8) xgetMembers;
+    void function(void*) xdtor;
+    void function(void*) xpostblit;
-}
-
@@ -177 +181 @@
-
-    static int opApply( int delegate( inout ModuleInfo ) );
+}
+
+abstract class MemberInfo
+{
+    Cutf8 name();
+}
+
+class MemberInfo_field : MemberInfo
+{
+    this(Cutf8 name, TypeInfo ti, size_t offset)
+    {
+    m_name = name;
+    m_typeinfo = ti;
+    m_offset = offset;
+    }
+
+    override Cutf8 name() { return m_name; }
+    TypeInfo typeInfo() { return m_typeinfo; }
+    size_t offset() { return m_offset; }
+
+    Cutf8 m_name;
+    TypeInfo m_typeinfo;
+    size_t m_offset;
+}
+
+class MemberInfo_function : MemberInfo
+{
+    this(Cutf8 name, TypeInfo ti, void* fp, uint flags)
+    {
+    m_name = name;
+    m_typeinfo = ti;
+    m_fp = fp;
+    m_flags = flags;
+    }
+
+    override Cutf8 name() { return m_name; }
+    TypeInfo typeInfo() { return m_typeinfo; }
+    void* fp() { return m_fp; }
+    uint flags() { return m_flags; }
+
+
+    Cutf8 m_name;
+    TypeInfo m_typeinfo;
+    void* m_fp;
+    uint m_flags;
-}
-