Changeset 507

Timestamp:

01/14/11 08:00:57 (14 years ago)

Author:

Don Clugston

Message:

No longer need to throw and catch Objects.

Files:

• trunk/src/rt/arrayassign.d (modified) (2 diffs)
• trunk/src/rt/dmain2.d (modified) (2 diffs)

trunk/src/rt/arrayassign.d

@@ -100 +100 @@
-    int i;
-    try
-    {
-        for (i = 0; i < to.length; i++)
-        {
-            // Copy construction is defined as bit copy followed by postblit.
-            memcpy(to.ptr + i * element_size, from.ptr + i * element_size, element_size);
-            ti.postblit(to.ptr + i * element_size);
-        }
-    }
-Object
+Throwable
-    {
-        /* Destroy, in reverse order, what we've constructed so far
-         */
-        while (i--)
-        {
-            ti.destroy(to.ptr + i * element_size);
-        }
-
-        throw o;
-    }
@@ -165 +165 @@
-    try
-    {
-        foreach (i; 0 .. count)
-        {
-            // Copy construction is defined as bit copy followed by postblit.
-            memcpy(p, value, element_size);
-            ti.postblit(p);
-            p += element_size;
-        }
-    }
-Object
+Throwable
-    {
-        // Destroy, in reverse order, what we've constructed so far
-        while (p > pstart)
-        {
-            p -= element_size;
-            ti.destroy(p);
-        }
-
-        throw o;
-    }

trunk/src/rt/dmain2.d

@@ -272 +272 @@
-        _moduleCtor();
-        _moduleTlsCtor();
-        runModuleUnitTests();
-        return true;
-    }
-    catch (Throwable e)
-    {
-        if (dg)
-            dg(e);
-    }
-    catch
-    {
-
-    }
-    _d_criticalTerm();
-    return false;
-}
-
-void _d_criticalTerm()
-{
-    version (Posix)
-    {
-        _STD_critical_term();
-        _STD_monitor_staticdtor();
@@ -304 +300 @@
-        thread_joinAll();
-        _d_isHalting = true;
-        _moduleDtor();
-        gc_term();
-        return true;
-    }
-    catch (Throwable e)
-    {
-        if (dg)
-            dg(e);
-    }
-    catch
-    {
-
-    }
-    finally
-    {
-        _d_criticalTerm();
-    }
-    return false;
-}
-
-/***********************************
- * The D main() function supplied by the user's program