Some infix:<xor> improvements -- two true values passed to xor or ^^

now result in Nil instead of a segfault-inducing Parrot Undef.
rakudo · Aug 3, 2011 · cefbda4 · cefbda4
1 parent 20edd76
commit cefbda4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/Perl6/Actions.pm b/src/Perl6/Actions.pm
@@ -2561,11 +2561,8 @@ class Perl6::Actions is HLL::Actions {
         else {
             for $/.list { if $_.ast { $past.push($_.ast); } }
         }
-        if $sym eq '^^' || $sym eq 'xor' {
-            # XXX Put something equivalent in place...or fix.
-            #$past := PAST::Op.new(
-            #    :pasttype<call>, :name('!Undef_to_False'), $past
-            #);
+        if $past.pasttype eq 'xor_nqp' {
+            $past.push(PAST::Var.new(:named<false>, :scope<lexical_6model>, :name<Nil>));
         }
         if $key eq 'PREFIX' || $key eq 'INFIX' || $key eq 'POSTFIX' {
             $past := whatever_curry($/, $past, $key eq 'INFIX' ?? 2 !! 1);

diff --git a/src/Perl6/Grammar.pm b/src/Perl6/Grammar.pm
@@ -2202,7 +2202,7 @@ grammar Perl6::Grammar is HLL::Grammar {
     token infix:sym<&&>   { <sym>  <O('%tight_and, :pasttype<if>')> }
 
     token infix:sym<||>   { <sym>  <O('%tight_or, :assoc<left>, :pasttype<unless>')> }
-    token infix:sym<^^>   { <sym>  <O('%tight_or, :pasttype<xor>')> }
+    token infix:sym<^^>   { <sym>  <O('%tight_or, :pasttype<xor_nqp>')> }
     token infix:sym<//>   { <sym>  <O('%tight_or, :assoc<left>, :pasttype<def_or>')> }
     token infix:sym<min>  { <sym> >> <O('%tight_or')> }
     token infix:sym<max>  { <sym> >> <O('%tight_or')> }
@@ -2284,7 +2284,7 @@ grammar Perl6::Grammar is HLL::Grammar {
     token infix:sym<and>  { <sym> >> <O('%loose_and, :pasttype<if>')> }
 
     token infix:sym<or>   { <sym> >> <O('%loose_or, :assoc<left>, :pasttype<unless>')> }
-    token infix:sym<xor>  { <sym> >> <O('%loose_or, :pasttype<xor>')> }
+    token infix:sym<xor>  { <sym> >> <O('%loose_or, :pasttype<xor_nqp>')> }
     token infix:sym<orelse> { <sym> >> <O('%loose_or, :assoc<left>, :pasttype<def_or>')> }
 
     token infix:sym«<==»  { <sym> <O('%sequencer')> }

diff --git a/tools/build/NQP_REVISION b/tools/build/NQP_REVISION
@@ -1 +1 @@
-2011.06-138-gf68aa56
+2011.06-139-g4e5bf5f