RakuAST: add set-from-also/from-also flag to Is/Does trait

So that we can mark the origin of the trait, needed for deparsing and .raku handling
rakudo · Jul 29, 2023 · 7114b4d · 7114b4d
1 parent f151aba
commit 7114b4d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/src/Raku/ast/traits.rakumod b/src/Raku/ast/traits.rakumod
@@ -107,16 +107,20 @@ class RakuAST::Trait
             self.mark-applied;
         }
     }
+
+    # traits are not from an "also" by default
+    method from-also() { False }
 }
 
 # The is trait.
 class RakuAST::Trait::Is
   is RakuAST::Trait
   is RakuAST::BeginTime
 {
-    has RakuAST::Name $.name;
-    has RakuAST::Circumfix $.argument;
+    has RakuAST::Name       $.name;
+    has RakuAST::Circumfix  $.argument;
     has RakuAST::Term::Name $.resolved-name;
+    has Bool                $.from-also;
 
     method new(RakuAST::Name :$name!, RakuAST::Circumfix :$argument) {
         my $obj := nqp::create(self);
@@ -126,6 +130,11 @@ class RakuAST::Trait::Is
         $obj
     }
 
+    method set-from-also($from-also) {
+        nqp::bindattr(self, RakuAST::Trait::Is, '$!from-also',
+          $from-also ?? True !! False);
+    }
+
     method PERFORM-BEGIN(RakuAST::Resolver $resolver, RakuAST::IMPL::QASTContext $context) {
         # See if the name resolves as a type and commit to that.
         my $resolution := $resolver.resolve-name-constant($!name);
@@ -191,13 +200,19 @@ class RakuAST::Trait::Does
   is RakuAST::Trait
 {
     has RakuAST::Type $.type;
+    has Bool          $.from-also;
 
     method new(RakuAST::Type $type) {
         my $obj := nqp::create(self);
         nqp::bindattr($obj, RakuAST::Trait::Does, '$!type', $type);
         $obj
     }
 
+    method set-from-also($from-also) {
+        nqp::bindattr(self, RakuAST::Trait::Does, '$!from-also',
+          $from-also ?? True !! False);
+    }
+
     method IMPL-TRAIT-NAME() { 'does' }
 
     method IMPL-TRAIT-ARGS(RakuAST::Resolver $resolver, RakuAST::Node $target) {

diff --git a/src/core.c/RakuAST/Deparse.pm6 b/src/core.c/RakuAST/Deparse.pm6
@@ -996,7 +996,8 @@ class RakuAST::Deparse {
 
         if $ast.traits -> @traits {
             for @traits -> $trait {
-                @parts.push(self.deparse($trait));
+                @parts.push(self.deparse($trait))
+                  unless try $trait.from-also;
             }
         }
 

diff --git a/src/core.c/RakuAST/Raku.pm6 b/src/core.c/RakuAST/Raku.pm6
@@ -543,8 +543,11 @@ augment class RakuAST::Node {
             );
         }
 
+        my @traits = self.traits.grep(!*.from-also);
         self!add-WHY: $self!nameds:
-          <scope declarator name how repr traits body>,
+          <scope declarator name how repr>,
+          (traits => @traits if @traits),
+          'body',
           (parameterization => $signature
             if $signature && $signature.parameters.elems)
     }