Merge branch 'ng' of git@github.com:rakudo/rakudo into ng

src/Perl6/Actions.pm

@@ -170,7 +170,13 @@ method pblock($/) {
             }
         }
     }
+    if $<lambda> eq '<->' {
+        $signature.set_rw_by_default();
+    }
     add_signature($block, $signature, 0);
+    if $<lambda> {
+        prevent_null_return($block);
+    }
     make $block;
 }
 
@@ -2161,3 +2167,11 @@ sub is_attr_alias($name) {
     }
     return "";
 }
+
+# Gives a block a Nil to return if it has no statements, to prevent Null
+# PMCs being handed back.
+sub prevent_null_return($block) {
+    if +@($block[1]) == 0 {
+        $block[1].push(PAST::Op.new( :name('&Nil') ));
+    }
+}

src/Perl6/Compiler/Signature.pm

@@ -150,6 +150,15 @@ method get_declarations() {
 }
 
 
+# Sets all parameters without an explicit read type to default to rw.
+method set_rw_by_default() {
+    my @entries := self.entries;
+    for @entries {
+        $_.is_rw(1);
+    }
+}
+
+
 # Produces an AST for generating a low-level signature object. Optionally can
 # instead produce code to generate a high-level signature object.
 method ast($high_level?) {
@@ -337,23 +346,6 @@ method entries() {
     $!entries
 }
 
-
-
-#############################################################################
-####################### CODE TO RE-WRITE IN NG BRANCH #######################
-#############################################################################
-
-# Sets all parameters without an explicit read type to default to rw.
-method set_rw_by_default() {
-    my @entries := self.entries;
-    for @entries {
-        unless $_<read_type> {
-            $_<read_type> := 'rw';
-        }
-    }
-}
-
-
 # Local Variables:
 #   mode: cperl
 #   cperl-indent-level: 4

src/Perl6/Grammar.pm

@@ -273,7 +273,7 @@ token xblock($*IMPLICIT = 0) {
 }
 
 token pblock($*IMPLICIT = 0) {
-    | <.lambda>
+    | <lambda>
         <.newpad>
         :my $*SCOPE := 'my';
         <signature>

t/spectest.data

@@ -177,7 +177,7 @@ S03-operators/subscript-vs-lt.t
 S03-operators/so.t
 # S03-operators/value_equivalence.t
 # S04-blocks-and-statements/pointy-rw.t
-# S04-blocks-and-statements/pointy.t
+S04-blocks-and-statements/pointy.t
 S04-phasers/end.t
 # S04-phasers/start.t
 # S04-declarations/constant.t