supply name to X::Bind::NativeType, jnthn++

rakudo · Aug 21, 2012 · e0ffd92 · e0ffd92
1 parent 9162d07
commit e0ffd92
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -4057,7 +4057,9 @@ class Perl6::Actions is HLL::Actions {
         if $target.isa(QAST::Var) {
             # Check it's not a native type; we can't bind to those.
             if pir::repr_get_primitive_type_spec__IP($target.returns) {
-                $*W.throw($/, ['X', 'Bind', 'NativeType']);
+                $*W.throw($/, ['X', 'Bind', 'NativeType'],
+                        name => ($target.name // ''),
+                );
             }
 
             # We may need to decontainerize the right, depending on sigil.

diff --git a/src/core/Exception.pm b/src/core/Exception.pm
@@ -496,8 +496,9 @@ my class X::Bind is Exception {
     }
 }
 my class X::Bind::NativeType does X::Comp {
+    has $.name;
     method message() {
-        'Cannot bind to a natively typed variable; use assignment instead'
+        "Cannot bind to natively typed variable '$.name'; use assignment instead"
     }
 }
 my class X::Bind::Slice is Exception  {

diff --git a/src/core/Str.pm b/src/core/Str.pm
@@ -1045,7 +1045,7 @@ multi infix:<~&>(Str:D \a, Str:D \b) returns Str:D {
 }
 multi infix:<~&>(str $a, str $b) returns str { nqp::bitand_s($a, $b) }
 
-multi infix:<~^>(Str:D \a, Str:D \b) returns Bool:D {
+multi infix:<~^>(Str:D \a, Str:D \b) returns Str:D {
     nqp::p6box_s(nqp::bitxor_s(nqp::unbox_s(a), nqp::unbox_s(b)))
 }
 multi infix:<~^>(str $a, str $b) returns str { nqp::bitxor_s($a, $b) }