Visualizer node aggregates

Fix in macro expander

ASTPlayground/ASTPlayground.dproj

@@ -4,7 +4,7 @@
         <ProjectVersion>20.3</ProjectVersion>
         <FrameworkType>FMX</FrameworkType>
         <Base>True</Base>
-        <Config Condition="'$(Config)'==''">Release</Config>
+        <Config Condition="'$(Config)'==''">Debug</Config>
         <Platform Condition="'$(Platform)'==''">Win64</Platform>
         <ProjectName Condition="'$(ProjectName)'==''">ASTPlayground</ProjectName>
         <TargetedPlatforms>2</TargetedPlatforms>

ASTPlayground/MainForm.fmx

@@ -234,8 +234,29 @@ object Form1: TForm1
   object ScriptMemo: TMemo
     Touch.InteractiveGestures = [Pan, LongTap, DoubleTap]
     DataDetectorTypes = []
+    Lines.Strings = (
+      '(do'
+      '(defmacro repeat [n body]'
+      '  `(do'
+      '    (def loop (fn [counter]'
+      '      (if (> counter 0)'
+      '        (do'
+      '          ~body'
+      '          (recur (- counter 1))'
+      '        )'
+      '        (do'
+      '        )'
+      '      )'
+      '    ))'
+      '    (loop ~n)'
+      '  )'
+      ')'
+      ''
+      '(repeat 5 "hi")'
+      ')')
     StyledSettings = [Size, Style, FontColor]
     TextSettings.Font.Family = 'Consolas'
+    OnChange = ScriptMemoChange
     OnChangeTracking = ScriptMemoChange
     Align = Right
     Position.X = 920.000000000000000000

ASTPlayground/MainForm.pas

@@ -1348,14 +1348,16 @@ procedure TForm1.ShowVizualization(X, Y: Single);
 begin
     FWorkspace.DeleteChildren;
 
-    if FCurrAst <> nil then
+    FWorkspace.Build(FCurrUnboundAst, TPointF.Create(X, Y));
-    begin
+    //
-        FWorkspace.Build(FCurrAst, TPointF.Create(X, Y));
+    //    if FCurrAst <> nil then
-    end
+    //    begin
-    else if FCurrUnboundAst <> nil then
+    //        FWorkspace.Build(FCurrAst, TPointF.Create(X, Y));
-    begin
+    //    end
-        FWorkspace.Build(FCurrUnboundAst, TPointF.Create(X, Y));
+    //    else if FCurrUnboundAst <> nil then
-    end;
+    //    begin
+    //        FWorkspace.Build(FCurrUnboundAst, TPointF.Create(X, Y));
+    //    end;
 end;
 
 end.

Src/AST/Myc.Ast.Binding.pas

@@ -181,9 +181,11 @@ end;
 
 function TAstBinder.VisitMacroExpansionNode(const Node: IMacroExpansionNode): IAstNode;
 begin
-    // The MacroExpander (Phase 1) should have unwrapped this.
+    // The MacroExpander (Phase 1) created this node.
-    // We only visit the *expanded* body.
+    // We must bind the ExpandedBody, but keep the MacroExpansionNode wrapper.
-    Result := Accept(Node.ExpandedBody);
+    // The base TAstTransformer implementation already does exactly this
+    // by visiting Callee, Arguments, and ExpandedBody.
+    Result := inherited VisitMacroExpansionNode(Node);
 end;
 
 function TAstBinder.VisitFunctionCall(const Node: IFunctionCallNode): IAstNode;

Src/AST/Myc.Ast.MacroExpander.pas

@@ -1,3 +1,6 @@
+//==================================================================================================
+//== FULL UNIT START: Myc.Ast.MacroExpander (from Myc.Ast.MacroExpander.pas)
+//==================================================================================================
 unit Myc.Ast.MacroExpander;
 
 interface
@@ -280,7 +283,8 @@ begin
     // --- It is a macro, expand it ---
 
     // 1. Create the temporary scope for the macro parameters
-    var expansionScope := TAst.CreateScope(nil);
+    //    It must be parented to the *initial* scope to find other macros/globals.
+    var expansionScope := TAst.CreateScope(FInitialScope);
     var params := macroDef.Parameters;
     if Length(Node.Arguments) <> Length(params) then
         raise Exception
@@ -301,14 +305,11 @@ begin
             boundSubAst: IAstNode;
         begin
             // This is the compile-time evaluation (Binder + Evaluator)
-            // It runs in the *current* context (FInitialScope + FCurrentDescriptor)
+            // [FIX] It must run in the 'expansionScope' which contains the parameters.
-            var tempInitScope := TScope.CreateScope(FInitialScope.Parent, FCurrentDescriptor, nil);
+            boundSubAst := TAstBinder.Bind(expansionScope, ANodeToEvaluate, subDescriptor);
 
-            // Bind (mutates ANodeToEvaluate) and get its descriptor
+            // Create eval scope from the new descriptor, parented to the expansion scope
-            boundSubAst := TAstBinder.Bind(tempInitScope, ANodeToEvaluate, subDescriptor);
+            evalScope := subDescriptor.CreateScope(expansionScope);
-
-            // Create eval scope from the new descriptor
-            evalScope := subDescriptor.CreateScope(tempInitScope);
 
             evaluator := FEvaluatorFactory(evalScope);
             Result := evaluator.Execute(boundSubAst);

Src/AST/Myc.Ast.Nodes.pas

@@ -68,6 +68,12 @@ type
         akNop // Added Nop
     );
 
+    // Helper for TAstNodeKind providing a string representation
+    TAstNodeKindHelper = record helper for TAstNodeKind
+    public
+        function ToString: string;
+    end;
+
     // --- Concrete Type Definitions ---
 
     // Defines how an identifier's address was resolved.
@@ -377,7 +383,18 @@ type
 implementation
 
 uses
-    System.Classes;
+    System.Classes,
+    System.Rtti,
+    System.StrUtils;
+
+{ TAstNodeKindHelper }
+
+function TAstNodeKindHelper.ToString: string;
+begin
+    Result := TRttiEnumerationType.GetName<TAstNodeKind>(Self);
+    Assert(StartsText('ak', Result));
+    Result := Result.Substring(2);
+end;
 
 { TResolvedAddress }