RakuAST: avoid deparsing when we have access to the source.

rakudo · May 2, 2024 · 4988fb3 · 4988fb3
1 parent 80ae959
commit 4988fb3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/src/Raku/ast/code.rakumod b/src/Raku/ast/code.rakumod
@@ -2854,7 +2854,7 @@ class RakuAST::CurryThunk
     method new(Str $original-expression) {
         my $obj := nqp::create(self);
         nqp::bindattr($obj, RakuAST::CurryThunk, '$!parameters', []);
-        nqp::bindattr($obj, RakuAST::CurryThunk, '$!original-expression', $original-expression);
+        nqp::bindattr($obj, RakuAST::CurryThunk, '$!original-expression', nqp::hllizefor($original-expression, 'Raku'));
         $obj
     }
 

diff --git a/src/Raku/ast/expressions.rakumod b/src/Raku/ast/expressions.rakumod
@@ -70,7 +70,7 @@ class RakuAST::Expression
 
     # This creates the curry. Parameters are always added via CurryThunk.IMPL-ADD-PARAM
     method IMPL-CURRY() {
-        my $thunk := RakuAST::CurryThunk.new(self.DEPARSE);
+        my $thunk := RakuAST::CurryThunk.new(self.origin ?? self.origin.Str !! self.DEPARSE);
         self.wrap-with-thunk($thunk);
         $thunk
     }

diff --git a/src/Raku/ast/name.rakumod b/src/Raku/ast/name.rakumod
@@ -141,7 +141,8 @@ class RakuAST::Name
                 }
                 else {
                     nqp::push_s($canon-parts, '') if nqp::elems($!parts) == 1;
-                    nqp::push_s($canon-parts, '(' ~ $_.expr.DEPARSE ~ ')');
+                    my $expr := $_.expr;
+                    nqp::push_s($canon-parts, '(' ~ ($expr.origin ?? $expr.origin.Str !! $expr.DEPARSE) ~ ')');
                 }
             }
             else {

diff --git a/src/Raku/ast/pair.rakumod b/src/Raku/ast/pair.rakumod
@@ -100,7 +100,12 @@ class RakuAST::ColonPair
         my $value := self.simple-compile-time-quote-value;
         $value := self.value.IMPL-INTERPRET(RakuAST::IMPL::InterpContext.new)
             if !$value && self.value.IMPL-CAN-INTERPRET;
-        $!key ~ ($value ?? self.IMPL-QUOTE-VALUE($value) !! self.value.DEPARSE)
+        $!key ~ (
+            $value
+                ?? self.IMPL-QUOTE-VALUE($value)
+                !! self.value.origin
+                    ?? self.value.origin.Str
+                    !! self.value.DEPARSE)
     }
 
     method PRODUCE-IMPLICIT-LOOKUPS() {