Merge branch 'nom' of github.com:rakudo/rakudo into nom

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

src/core/Failure.pm

@@ -23,34 +23,26 @@ my class Failure {
     }
     multi method Bool(Failure:D:) { $!handled = 1; Bool::False; }
 
-    method Int(Failure:D:) { $!handled ?? 0 !! $!exception.throw; }
-    method Num(Failure:D:) { $!handled ?? 0e0 !! $!exception.throw; }
-    multi method Str(Failure:D:) { $!handled ?? '' !! $!exception.throw; }
+    method Int(Failure:D:)        { $!handled ?? 0   !! $!exception.throw; }
+    method Num(Failure:D:)        { $!handled ?? 0e0 !! $!exception.throw; }
+    method Numeric(Failure:D:)    { $!handled ?? 0e0 !! $!exception.throw; }
+    multi method Str(Failure:D:)  { $!handled ?? ''  !! $!exception.throw; }
+    multi method gist(Failure:D:) { $!handled ?? $.perl !! $!exception.throw; }
 
     Failure.^add_fallback(
         -> $, $ { True },
         method ($name) {
-            die $!exception;
+            $!exception.throw;
         }
     );
 }
 
 
 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
-                     # the location at the point of the fail()
-                     push_eh catch
-                     $P0 = find_lex '$value'
-                     $S0 = $P0
-                     die $S0
-                   catch:
-                     .get_results (%r)
-                     pop_eh
-                 };
-    my $fail := Failure.new(EXCEPTION($ex));
+    try die $value;
+    my $fail := Failure.new($!);
     my Mu $return := pir::find_caller_lex__Ps('RETURN');
     $return($fail) unless nqp::isnull($return);
     $fail

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;