Merge branch 'nom' into newio

rakudo · Mar 24, 2015 · 6d97b03 · 6d97b03
2 parents fe1265b + 9746e88
commit 6d97b03
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/Perl6/Grammar.nqp b/src/Perl6/Grammar.nqp
@@ -95,7 +95,6 @@ role STD {
     token babble($l, @base_tweaks?) {
         :my @extra_tweaks;
 
-        <.ws>
         [ <quotepair> <.ws>
             {
                 my $kv := $<quotepair>[-1].ast;
@@ -112,7 +111,7 @@ role STD {
             }
         ]*
 
-        $<B>=[<?>]
+        $<B>=[<?before .>]
         {
             # Work out the delimeters.
             my $c := $/.CURSOR;

diff --git a/src/Perl6/World.nqp b/src/Perl6/World.nqp
@@ -1971,9 +1971,12 @@ class Perl6::World is HLL::World {
     # Curries a role with the specified arguments.
     method parameterize_type_with_args($role, @pos_args, %named_args) {
         # Make the curry right away and add it to the SC.
-        my $curried := $role.HOW.parameterize($role, |@pos_args, |%named_args);
-        self.add_object($curried);
-        return $curried;
+        if @pos_args || %named_args {
+            my $curried := $role.HOW.parameterize($role, |@pos_args, |%named_args);
+            self.add_object($curried);
+            return $curried;
+        }
+        $role;
     }
 
     # Creates a subset type meta-object/type object pair.

diff --git a/src/core/operators.pm b/src/core/operators.pm
@@ -187,6 +187,7 @@ sub SEQUENCE($left, Mu $right, :$exclude_end) {
                 my $count = $code.count;
                 while 1 {
                     $tail.munch($tail.elems - $count);
+                    $value := Nil; ## don't return previous value when 'last' is called from $code
                     $value := $code(|$tail);
                     if $end_code_arity != 0 {
                         $end_tail.push($value);