RakuAST: fix RakuAST::Package.raku

And make the signature argument on replace-body optional to preserve compatibility.
rakudo · Mar 13, 2023 · 23a7c14 · 23a7c14
1 parent 1d7bf1c
commit 23a7c14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/Raku/ast/package.rakumod b/src/Raku/ast/package.rakumod
@@ -61,7 +61,7 @@ class RakuAST::Package
         $obj
     }
 
-    method replace-body(RakuAST::Code $body, RakuAST::Signature $signature) {
+    method replace-body(RakuAST::Code $body, RakuAST::Signature $signature?) {
         $body := RakuAST::Block.new unless $body;
 
         # The body of a role is internally a Sub that has the parameterization

diff --git a/src/core.c/RakuAST/Raku.pm6 b/src/core.c/RakuAST/Raku.pm6
@@ -390,14 +390,17 @@ augment class RakuAST::Node {
         my $self := self;
         if self.declarator eq 'role' {
             $self := nqp::clone(self);
-            $self.replace-body(
-              RakuAST::Block.new(
-                body => RakuAST::Blockoid.new(
-                  RakuAST::StatementList.new(  # lose fabricated return value
-                    |self.body.body.statement-list.statements.head(*-1)
-                  )
-                )
-              )
+            my $statements := self.body.body.statement-list.statements;
+            nqp::bindattr($self, RakuAST::Package, '$!body',
+              $statements.elems == 1
+                ?? RakuAST::Block
+                !! RakuAST::Block.new(
+                     body => RakuAST::Blockoid.new(
+                       RakuAST::StatementList.new(
+                         |$statements.head(*-1) # lose fabricated return value
+                       )
+                     )
+                   )
             );
         }