Changeset 519 for trunk/src

Timestamp:

01/23/11 04:26:02 (1 year ago)

Author:

jmdavis

Message:

Added Throwable and default arguments to most Exception and Error constructors.

For whatever reason, a number of Exception and Error types didn't take a
Throwable for chaining exceptions, and most of them didn't have default
arguments for file and line number (some didn't even take file and line
number in the first place). So, most of the Exception and Error types in
core.exception and object_.d/object.di now have take an optional
Throwable argument and optional file and line number arguments which
default to FILE and LINE. In at least one case (AssertError?), I
couldn't make it take default arguments for file and line number without
breaking code, so it doesn't. But if I could do it and maintain
backwards comptability, I did. I also added unit tests to verify that
the various constructors work properly.

Files:

• trunk/src/core/exception.d (modified) (15 diffs)
• trunk/src/object_.d (modified) (3 diffs)

trunk/src/core/exception.d

@@ -3 +3 @@
- * mechanism to alter system-level error handling.
- *
-09
+11
- * License:   $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
-
+ and Jonathan M Davis
- * Source:    $(DRUNTIMESRC core/_exception.d)
- */
-
-09
+11
- * Distributed under the Boost Software License, Version 1.0.
- *    (See accompanying file LICENSE_1_0.txt or copy at
@@ -34 +34 @@
-class RangeError : Error
-{
+    this( string file = __FILE__, size_t line = __LINE__, Throwable next = null )
+    {
+        super( "Range violation", file, line, next );
+    }
+}
+
+unittest
+{
+    {
+        auto re = new RangeError();
+        assert(re.file == __FILE__);
+        assert(re.line == __LINE__ - 2);
+        assert(re.next is null);
+        assert(re.msg == "Range violation");
+    }
+
+    {
+        auto re = new RangeError("hello", 42, new Exception("It's an Exception!"));
+        assert(re.file == "hello");
+        assert(re.line == 42);
+        assert(re.next !is null);
+        assert(re.msg == "Range violation");
+    }
+}
+
+
+/**
+ * Thrown on an assert error.
+ */
+class AssertError : Error
+{
-    this( string file, size_t line )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -65 +140 @@
-    ClassInfo   info;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-
@@ -77 +157 @@
-}
-
+unittest
+{
+    ClassInfo info = new ClassInfo;
+    info.name = "testInfo";
+
+    {
+        auto fe = new FinalizeError(info);
+        assert(fe.file == __FILE__);
+        assert(fe.line == __LINE__ - 2);
+        assert(fe.next is null);
+        assert(fe.msg == "Finalization error");
+        assert(fe.info == info);
+    }
+
+    {
+        auto fe = new FinalizeError(info, new Exception("It's an Exception!"));
+        assert(fe.file == __FILE__);
+        assert(fe.line == __LINE__ - 2);
+        assert(fe.next !is null);
+        assert(fe.msg == "Finalization error");
+        assert(fe.info == info);
+    }
+
+    {
+        auto fe = new FinalizeError(info, "hello", 42);
+        assert(fe.file == "hello");
+        assert(fe.line == 42);
+        assert(fe.next is null);
+        assert(fe.msg == "Finalization error");
+        assert(fe.info == info);
+    }
+
+    {
+        auto fe = new FinalizeError(info, "hello", 42, new Exception("It's an Exception!"));
+        assert(fe.file == "hello");
+        assert(fe.line == 42);
+        assert(fe.next !is null);
+        assert(fe.msg == "Finalization error");
+        assert(fe.info == info);
+    }
+}
+
-
-/**
@@ -83 +205 @@
-class HiddenFuncError : Error
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -95 +239 @@
-class OutOfMemoryError : Error
-{
- string file, size_t line
-
-
+string file = __FILE__, size_t line = __LINE__, Throwable next = null
+
+, next
-    }
-
@@ -106 +250 @@
-}
-
+unittest
+{
+    {
+        auto oome = new OutOfMemoryError();
+        assert(oome.file == __FILE__);
+        assert(oome.line == __LINE__ - 2);
+        assert(oome.next is null);
+        assert(oome.msg == "Memory allocation failed");
+    }
+
+    {
+        auto oome = new OutOfMemoryError("hello", 42, new Exception("It's an Exception!"));
+        assert(oome.file == "hello");
+        assert(oome.line == 42);
+        assert(oome.next !is null);
+        assert(oome.msg == "Memory allocation failed");
+    }
+}
+
-
-/**
@@ -112 +275 @@
-class SwitchError : Error
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -126 +308 @@
-    size_t idx;
-
-
-
-
+, string file = __FILE__, size_t line = __LINE__, Throwable next = null
+
+, file, line, next
-        this.idx = idx;
+    }
+}
+
+unittest
+{
+    {
+        auto ue = new UnicodeException("msg", 2);
+        assert(ue.file == __FILE__);
+        assert(ue.line == __LINE__ - 2);
+        assert(ue.next is null);
+        assert(ue.msg == "msg");
+        assert(ue.idx == 2);
+    }
+
+    {
+        auto ue = new UnicodeException("msg", 2, "hello", 42, new Exception("It's an Exception!"));
+        assert(ue.file == "hello");
+        assert(ue.line == 42);
+        assert(ue.next !is null);
+        assert(ue.msg == "msg");
+        assert(ue.idx == 2);
-    }
-}
@@ -164 +367 @@
- *  line = The line number on which this error occurred.
- */
-, size_t line
+ = __FILE__, size_t line = __LINE__
-{
-    if( assertHandler is null )
@@ -220 +423 @@
- *  RangeError.
- */
-, size_t line
-
-
+ = __FILE__, size_t line = __LINE__, Throwable next = null
+
+, next
-}
-
@@ -235 +438 @@
- *  FinalizeError.
- */
-x
-
-ex
+, string file = __FILE__, size_t line = __LINE__
+
+file, line, e
-}
-
@@ -248 +451 @@
- *  HiddenFuncError.
- */
-
-
-
+, string file = __FILE__, size_t line = __LINE__, Throwable next = null
+
+, file, line, next
-}
-
@@ -279 +482 @@
- *  SwitchError.
- */
-, size_t line
-
-
+ = __FILE__, size_t line = __LINE__, Throwable next = null
+
+, next
-}
-
@@ -295 +498 @@
- *  UnicodeException.
- */
-
-
-
-
+, string file = __FILE__, size_t line = __LINE__
+
+, file, line
+

trunk/src/object_.d

@@ -6 +6 @@
- *      WIKI = Object
- *
-0
+1
- * License:   <a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>.
- * Authors:   Walter Bright, Sean Kelly
- */
-
-09
+11
- * Distributed under the Boost Software License, Version 1.0.
- *    (See accompanying file LICENSE_1_0.txt or copy at
@@ -1324 +1324 @@
-class Exception : Throwable
-{
-
-
-
-
-
-
+
+
-    {
-        super(msg, file, line, next);
-    }
+    this(string msg, Throwable next, string file = __FILE__, size_t line = __LINE__)
+    {
+        super(msg, file, line, next);
+    }
+}
+
+unittest
+{
+    {
+        auto e = new Exception("msg");
+        assert(e.file == __FILE__);
+        assert(e.line == __LINE__ - 2);
+        assert(e.next is null);
+        assert(e.msg == "msg");
+    }
+
+    {
+        auto e = new Exception("msg", new Exception("It's an Excepton!"), "hello", 42);
+        assert(e.file == "hello");
+        assert(e.line == 42);
+        assert(e.next !is null);
+        assert(e.msg == "msg");
+    }
+
+    {
+        auto e = new Exception("msg", "hello", 42, new Exception("It's an Exception!"));
+        assert(e.file == "hello");
+        assert(e.line == 42);
+        assert(e.next !is null);
+        assert(e.msg == "msg");
+    }
-}
-
@@ -1338 +1365 @@
-class Error : Throwable
-{
-
-
-
-
-
-
-
+
-    {
-        super(msg, file, line, next);
-        bypassedException = null;
-    }
+
+    this(string msg, string file = __FILE__, size_t line = __LINE__, Throwable next = null)
+    {
+        super(msg, file, line, next);
+        bypassedException = null;
+    }
+
-    /// The first Exception which was bypassed when this Error was thrown,
-    /// or null if no Exceptions were pending.
-    Throwable   bypassedException;
+}
+
+unittest
+{
+    {
+        auto e = new Error("msg");
+        assert(e.file == __FILE__);
+        assert(e.line == __LINE__ - 2);
+        assert(e.next is null);
+        assert(e.msg == "msg");
+        assert(e.bypassedException is null);
+    }
+
+    {
+        auto e = new Error("msg", new Exception("It's an Excepton!"), "hello", 42);
+        assert(e.file == "hello");
+        assert(e.line == 42);
+        assert(e.next !is null);
+        assert(e.msg == "msg");
+        assert(e.bypassedException is null);
+    }
+
+    {
+        auto e = new Error("msg", "hello", 42, new Exception("It's an Exception!"));
+        assert(e.file == "hello");
+        assert(e.line == 42);
+        assert(e.next !is null);
+        assert(e.msg == "msg");
+        assert(e.bypassedException is null);
+    }
-}
-