RakuAST: fix some more places where code-statements should be used

rakudo · Apr 30, 2023 · 654fb38 · 654fb38
1 parent edaa90a
commit 654fb38
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/Raku/ast/circumfix.rakumod b/src/Raku/ast/circumfix.rakumod
@@ -47,7 +47,7 @@ class RakuAST::Circumfix::ArrayComposer
     }
 
     method canonicalize() {
-        my @statements := self.IMPL-UNWRAP-LIST(self.semilist.statements);
+        my @statements := self.semilist.code-statements;
         if nqp::elems(@statements) == 1 {
             self.IMPL-QUOTE-VALUE(@statements[0].expression.literal-value)
         }
@@ -83,12 +83,12 @@ class RakuAST::Circumfix::ArrayComposer
     }
 
     method IMPL-CAN-INTERPRET() {
-        my @statements := self.IMPL-UNWRAP-LIST(self.semilist.statements);
+        my @statements := self.semilist.code-statements;
         nqp::elems(@statements) == 1 && @statements[0].IMPL-CAN-INTERPRET
     }
 
     method IMPL-INTERPRET(RakuAST::IMPL::InterpContext $ctx) {
-        my @statements := self.IMPL-UNWRAP-LIST(self.semilist.statements);
+        my @statements := self.semilist.code-statements;
         my $result := @statements[0].IMPL-INTERPRET($ctx);
         Array.new($result)
     }

diff --git a/src/Raku/ast/expressions.rakumod b/src/Raku/ast/expressions.rakumod
@@ -1261,7 +1261,7 @@ class RakuAST::Postcircumfix::HashIndex
 
     method resolve-with(RakuAST::Resolver $resolver) {
         my $resolved := $resolver.resolve-lexical(
-            nqp::elems(self.IMPL-UNWRAP-LIST($!index.statements)) > 1
+            nqp::elems($!index.code-statements) > 1
                 ?? '&postcircumfix:<{; }>'
                 !! '&postcircumfix:<{ }>');
         if $resolved {
@@ -1405,7 +1405,8 @@ class RakuAST::ApplyPostfix
         if nqp::istype($operand, RakuAST::Circumfix::Parentheses)
             && $operand.semilist.IMPL-IS-SINGLE-EXPRESSION
         {
-            my $statement := self.IMPL-UNWRAP-LIST($operand.semilist.statements)[0];
+            my $statement :=
+              self.IMPL-UNWRAP-LIST($operand.semilist.code-statements)[0];
             $operand := $statement.expression
                 unless $statement.condition-modifier || $statement.loop-modifier;
         }

diff --git a/src/Raku/ast/statements.rakumod b/src/Raku/ast/statements.rakumod
@@ -318,7 +318,7 @@ class RakuAST::StatementList
     }
 
     method visit-children(Code $visitor) {
-        for self.IMPL-UNWRAP-LIST(self.statements) {
+        for $!statements {
             $visitor($_);
         }
     }

diff --git a/src/Raku/ast/variable-declaration.rakumod b/src/Raku/ast/variable-declaration.rakumod
@@ -584,7 +584,7 @@ class RakuAST::VarDeclaration::Simple
                     operand => RakuAST::Declaration::ResolvedConstant.new(
                         :compile-time-value(
                             $!shape && self.sigil eq '%'
-                                ?? self.IMPL-CONTAINER-TYPE($of, :key-type(self.IMPL-UNWRAP-LIST($!shape.statements)[0].expression.compile-time-value))
+                                ?? self.IMPL-CONTAINER-TYPE($of, :key-type($!shape.code-statements[0].expression.compile-time-value))
                                 !! self.IMPL-CONTAINER-TYPE($of)
                         )
                     ),
@@ -702,7 +702,7 @@ class RakuAST::VarDeclaration::Simple
             my $meta-object := $!attribute-package.attribute-type.new(
                 name => self.sigil ~ '!' ~ self.desigilname.canonicalize,
                 type => $!shape && self.sigil eq '%'
-                    ?? self.IMPL-CONTAINER-TYPE($of, :key-type(self.IMPL-UNWRAP-LIST($!shape.statements)[0].expression.compile-time-value))
+                    ?? self.IMPL-CONTAINER-TYPE($of, :key-type($!shape.code-statements[0].expression.compile-time-value))
                     !! self.IMPL-CONTAINER-TYPE($of),
                 has_accessor => self.twigil eq '.',
                 container_descriptor => $cont-desc,
@@ -757,7 +757,7 @@ class RakuAST::VarDeclaration::Simple
                 );
                 if $!shape || self.IMPL-HAS-CONTAINER-BASE-TYPE {
                     my $value := $!shape && self.sigil eq '%'
-                        ?? self.IMPL-CONTAINER-TYPE($of, :key-type(self.IMPL-UNWRAP-LIST($!shape.statements)[0].expression.compile-time-value))
+                        ?? self.IMPL-CONTAINER-TYPE($of, :key-type($!shape.code-statements[0].expression.compile-time-value))
                         !! self.IMPL-CONTAINER-TYPE($of);
                     $context.ensure-sc($value);
                     $qast := QAST::Op.new( :op('bind'), $qast, QAST::Op.new(