AST testing

Src/AST/Myc.Ast.Environment.pas

@@ -228,20 +228,6 @@ type
         function CreateVisitor(const AScope: IExecutionScope): IEvaluatorVisitor;
     end;
 
-    { TMacroRegistryImpl }
-    TMacroRegistryImpl = class(TInterfacedObject, IMacroRegistry)
-    private
-        FParent: IMacroRegistry;
-        FMacros: TDictionary<string, IMacroDefinitionNode>;
-        function GetParent: IMacroRegistry;
-    public
-        constructor Create(AParent: IMacroRegistry);
-        destructor Destroy; override;
-        procedure Define(const Node: IMacroDefinitionNode);
-        function Find(const Name: string): IMacroDefinitionNode;
-        function CreateChildRegistry: IMacroRegistry;
-    end;
-
     TFunctionDefinitionRegistry = class(TInterfacedObject, IFunctionDefinitionRegistry)
     private
         FMap: TDictionary<TResolvedAddress, IFunctionDefinition>;
@@ -336,7 +322,7 @@ begin
     // Initialize root scope with library registration
     RootScope := TAst.CreateScope(nil, nil, True);
 
-    Result.Create(TEnvironment.Create(RootScope, TMacroRegistryImpl.Create(nil), TStandardExecutionStrategy.Create));
+    Result.Create(TEnvironment.Create(RootScope, TMacroRegistry.Create(nil), TStandardExecutionStrategy.Create));
 end;
 
 function TAstEnvironment.CreateEnvironment: TAstEnvironment;
@@ -393,50 +379,6 @@ begin
     Result := TDebugEvaluatorVisitor.Create(AScope, FLog, FShowScope, 0);
 end;
 
-{ TMacroRegistryImpl }
-
-constructor TMacroRegistryImpl.Create(AParent: IMacroRegistry);
-begin
-    inherited Create;
-    FParent := AParent;
-    FMacros := TDictionary<string, IMacroDefinitionNode>.Create;
-end;
-
-destructor TMacroRegistryImpl.Destroy;
-begin
-    FMacros.Free;
-    inherited Destroy;
-end;
-
-function TMacroRegistryImpl.GetParent: IMacroRegistry;
-begin
-    Result := FParent;
-end;
-
-procedure TMacroRegistryImpl.Define(const Node: IMacroDefinitionNode);
-begin
-    FMacros.AddOrSetValue(Node.Name.Name, Node);
-end;
-
-function TMacroRegistryImpl.Find(const Name: string): IMacroDefinitionNode;
-var
-    current: IMacroRegistry;
-begin
-    current := Self;
-    while Assigned(current) do
-    begin
-        if (current as TMacroRegistryImpl).FMacros.TryGetValue(Name, Result) then
-            exit;
-        current := current.Parent;
-    end;
-    Result := nil;
-end;
-
-function TMacroRegistryImpl.CreateChildRegistry: IMacroRegistry;
-begin
-    Result := TMacroRegistryImpl.Create(Self);
-end;
-
 { TFunctionDefinitionRegistry }
 
 constructor TFunctionDefinitionRegistry.Create;
@@ -514,7 +456,7 @@ end;
 
 function TEnvironment.CreateEnvironment: IEnvironment;
 begin
-    Result := TEnvironment.Create(TAst.CreateScope(FRootScope), TMacroRegistryImpl.Create(FMacroRegistry), FExecutionStrategy);
+    Result := TEnvironment.Create(TAst.CreateScope(FRootScope), TMacroRegistry.Create(FMacroRegistry), FExecutionStrategy);
 end;
 
 function TEnvironment.Compile(