Changeset 2195

Timestamp:

05/11/07 13:57:11 (2 years ago)

Author:

kris

Message:

removed the isHalting() function, and placed the functionality inside Exception (as a static bool) since that's the relevant environment.

Files:

• trunk/lib/compiler/dmd/dmain2.d (modified) (2 diffs)
• trunk/lib/compiler/dmd/genobj.d (modified) (2 diffs)
• trunk/lib/compiler/gdc/dgccmain2.d (modified) (2 diffs)
• trunk/lib/compiler/gdc/genobj.d (modified) (2 diffs)
• trunk/object.di (modified) (1 diff)

trunk/lib/compiler/dmd/dmain2.d

@@ -74 +74 @@
-}
-
-bool isHalting = false;
-
-extern (C) bool cr_isHalting()
-{
-    return isHalting;
-}
-
-extern (C) bool cr_trapExceptions = true;
-
@@ -159 +152 @@
-        _moduleUnitTests();
-        result = main(args);
-        isHalting = true;
-        _moduleDtor();
-        gc_term();

trunk/lib/compiler/dmd/genobj.d

@@ -893 +893 @@
-    size_t      line;
-    Exception   next;
+    static bool halting;
-
-    this(char[] msg, Exception next = null)
@@ -1064 +1065 @@
-{
-    debug(PRINTF) printf("_moduleDtor(): %d modules\n", _moduleinfo_dtors_i);
+    Exception.halting = true;
-    for (uint i = _moduleinfo_dtors_i; i-- != 0;)
-    {

trunk/lib/compiler/gdc/dgccmain2.d

@@ -72 +72 @@
-}
-
-bool isHalting = false;
-
-extern (C) bool cr_isHalting()
-{
-    return isHalting;
-}
-
-extern (C) bool cr_trapExceptions = true;
-
@@ -144 +137 @@
-        _moduleUnitTests();
-        result = main_func(args);
-        isHalting = true;
-        _moduleDtor();
-        gc_term();

trunk/lib/compiler/gdc/genobj.d

@@ -907 +907 @@
-    size_t      line;
-    Exception   next;
+    static bool halting;
-
-    this(char[] msg, Exception next = null)
@@ -1085 +1086 @@
-{
-    debug(PRINTF) printf("_moduleDtor(): %d modules\n", _moduleinfo_dtors_i);
+    Exception.halting = true;
-    for (uint i = _moduleinfo_dtors_i; i-- != 0;)
-    {

trunk/object.di

@@ -168 +168 @@
-    size_t      line;
-    Exception   next;
+    static bool halting;
-
-    this(char[] msg, Exception next = null);