Changeset 2241

Timestamp:

05/22/07 22:13:58 (2 years ago)

Author:

sean

Message:

Reverted the change of cr_isHalting to Exception.halting. At some point we may get an Application singleton which contains an isHalting method, so I'd prefer if this not be bound to any particular object for now.

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 _d_isHalting = false;
+
+extern (C) bool cr_isHalting()
+{
+    return _d_isHalting;
+}
+
-extern (C) bool cr_trapExceptions = true;
-
@@ -152 +159 @@
-        _moduleUnitTests();
-        result = main(args);
+        _d_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)
@@ -1065 +1064 @@
-{
-    debug(PRINTF) printf("_moduleDtor(): %d modules\n", _moduleinfo_dtors_i);
-
+
-    for (uint i = _moduleinfo_dtors_i; i-- != 0;)
-    {

trunk/lib/compiler/gdc/dgccmain2.d

@@ -72 +72 @@
-}
-
+bool _d_isHalting = false;
+
+extern (C) bool cr_isHalting()
+{
+    return _d_isHalting;
+}
+
-extern (C) bool cr_trapExceptions = true;
-
@@ -137 +144 @@
-        _moduleUnitTests();
-        result = main_func(args);
+        _d_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)
@@ -1086 +1085 @@
-{
-    debug(PRINTF) printf("_moduleDtor(): %d modules\n", _moduleinfo_dtors_i);
-
+
-    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);