start to fail() with typed exceptions from Str.Numeric

somewhere along the way it still stringifies though :(
rakudo · Mar 25, 2012 · 008dd40 · 008dd40
1 parent 06b4eca
commit 008dd40
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -508,4 +508,24 @@ my class X::Phaser::PrePost is Exception {
     }
 }
 
+my class X::Str::Numeric is Exception {
+    has $.source;
+    has $.pos;
+    has $.reason;
+    method source-indicator {
+        constant marker = chr(0x23CF);
+        join '', "in '",
+                $.source.substr(0, $.pos),
+                marker,
+                $.source.substr($.pos),
+                "' (indicated by the ",
+                marker,
+                " symbol)",
+                ;
+    }
+    method message() {
+        "Cannot convert string to number: $.reason $.source-indicator";
+    }
+}
+
 # vim: ft=perl6
diff --git a/src/core/Failure.pm b/src/core/Failure.pm
@@ -39,7 +39,7 @@ my class Failure {
 
 
 my &fail := -> *@msg {
-    my $value = @msg.join('');
+    my $value = @msg == 1 ?? @msg[0] !! @msg.join('');
     die $value if $*FATAL;
     my Mu $ex := Q:PIR {
                      # throw and immediately catch an exception, to capture

diff --git a/src/core/Str.pm b/src/core/Str.pm
@@ -2,6 +2,7 @@ my class Cursor {... }
 my class Range  {... }
 my class Match  {... }
 my class Buf    {... }
+my class X::Str::Numeric { ... }
 
 sub PARROT_ENCODING(Str:D $s) {
     my %map = (
@@ -161,14 +162,16 @@ my class Str does Stringy {
         my int $pos   = pir::find_not_cclass__Iisii(pir::const::CCLASS_WHITESPACE, $str, 0, $eos);
 
         my $tailfail =
-             -> { fail "trailing characters after number in conversion"
-                      if nqp::islt_i(
+             -> { fail(X::Str::Numeric.new(
+                     source => self,
+                     :$pos,
+                     reason => 'trailing characters after number',
+                 )) if nqp::islt_i(
                           pir::find_not_cclass__Iisii(pir::const::CCLASS_WHITESPACE,
                                                       $str, $pos, $eos),
                           $eos);
                   0;
              };
-
         # objects for managing the parse and results
         my Mu $parse;
         my $result;