move some code that belongs in Backtrace

rakudo · Apr 15, 2015 · a7b45b6 · a7b45b6
1 parent 06dfca6
commit a7b45b6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 11 deletions.
diff --git a/src/core/Backtrace.pm b/src/core/Backtrace.pm
@@ -31,8 +31,10 @@ my class Backtrace::Frame {
 my class Backtrace is List {
     proto method new(|) {*}
 
-    multi method new(Exception $e, Int $offset = 0) {
-        self.new(nqp::backtrace(nqp::getattr(nqp::decont($e), Exception, '$!ex')), $offset);
+    multi method new(Mu $e, Int $offset = 0) {
+        $e.^name eq 'BOOTException'
+            ?? self.new(nqp::backtrace(nqp::decont($e)), $offset)
+            !! self.new(nqp::backtrace(nqp::getattr(nqp::decont($e), Exception, '$!ex')), $offset);
     }
 
     multi method new(Int $offset = 0) {

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -8,15 +8,7 @@ my class Exception {
 
     method backtrace() {
         if $!bt { $!bt }
-        elsif nqp::isconcrete($!ex) {
-            if $!ex.^name eq 'BOOTException' {
-            "  Only a low-level backtrace is available here:\n    "
-                ~ nqp::join("\n    ", nqp::backtracestrings($!ex));
-            }
-            else {
-                Backtrace.new(nqp::decont($!ex));
-            }
-        }
+        elsif nqp::isconcrete($!ex) { Backtrace.new($!ex); }
         else { '' }
     }