RakuAST: fix deparse/raku of RakuAST::Name::Part::Expression

Well, actually the canonicalization of RakuAST::Name::Part::Expression
rakudo · Mar 12, 2023 · b685e67 · b685e67
1 parent a5be6d2
commit b685e67
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/Raku/ast/name.rakumod b/src/Raku/ast/name.rakumod
@@ -112,7 +112,8 @@ class RakuAST::Name
                 nqp::push_s($canon-parts, '');
             }
             elsif nqp::istype($_, RakuAST::Name::Part::Expression) {
-                nqp::push_s($canon-parts, $_.expr.DEPARSE);
+                nqp::push_s($canon-parts, '') if nqp::elems($!parts) == 1;
+                nqp::push_s($canon-parts, '(' ~ $_.expr.DEPARSE ~ ')');
             }
             else {
                 nqp::die('canonicalize NYI for non-simple name part ' ~ $_.HOW.name($_));

diff --git a/src/core.c/RakuAST/Raku.pm6 b/src/core.c/RakuAST/Raku.pm6
@@ -1290,7 +1290,13 @@ augment class RakuAST::Name::Part {
     }
 
     multi method raku(RakuAST::Name::Part::Expression:D: --> Str:D) {
-        self.^name ~ '.new(' ~ self.expr.raku ~ ')';
+        my str @parts = self.^name ~ '.new(';
+        RakuAST::Node::indent();
+        @parts.push: $*INDENT ~ self.expr.raku;
+        RakuAST::Node::dedent();
+        @parts.push: $*INDENT ~ ")";
+
+        @parts.join("\n")
     }
 
     multi method raku(RakuAST::Name::Part::Simple:D: --> Str:D) {