From 74d021c4dfc538c128a92f30120a746b81377398 Mon Sep 17 00:00:00 2001 From: Elizabeth Mattijsen Date: Thu, 11 May 2023 20:10:30 +0200 Subject: [PATCH] RakuAST: tweaks needed for further =table development - call interpret-as-table on the instance, not the type object - make sure Fixups are done *before* Deparse, Raku and Podify, to allow *all* of the fixups to be seen by them. --- src/core.c/RakuAST/Fixups.pm6 | 3 ++- tools/templates/6.c/core_sources | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/core.c/RakuAST/Fixups.pm6 b/src/core.c/RakuAST/Fixups.pm6 index 929d9a05ae2..0ae309e25ca 100644 --- a/src/core.c/RakuAST/Fixups.pm6 +++ b/src/core.c/RakuAST/Fixups.pm6 @@ -1,3 +1,4 @@ +my class RakuAST::LegacyPodify { ... } # This file contains augmentations to classes that are created in the # RakuAST bootstrap to allow a lot of logic (which will **NOT** be @@ -343,7 +344,7 @@ augment class RakuAST::Doc::Block { } elsif $type eq 'table' { - self.interpret-as-table($spaces, @paragraphs); + $block.interpret-as-table($spaces, @paragraphs); } # potentially need introspection diff --git a/tools/templates/6.c/core_sources b/tools/templates/6.c/core_sources index 4cc0146124d..3b463900fd6 100644 --- a/tools/templates/6.c/core_sources +++ b/tools/templates/6.c/core_sources @@ -253,8 +253,8 @@ src/core.c/Rakudo/Internals/PostcircumfixAdverbs.pm6 src/core.c/unicodey.pm6 src/core.c/Unicode.pm6 src/core.c/RakuAST/HTML/Entities.pm6 +src/core.c/RakuAST/Fixups.pm6 src/core.c/RakuAST/Deparse.pm6 src/core.c/RakuAST/Raku.pm6 src/core.c/RakuAST/LegacyPodify.pm6 -src/core.c/RakuAST/Fixups.pm6 src/core.c/core_epilogue.pm6