#15 - удалил концепцию метода из бекенда

Stepami · Jul 18, 2024 · 4d86b41 · 4d86b41
1 parent 9820043
commit 4d86b41
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 52 deletions.
diff --git a/HydraScript.Lib/BackEnd/Instructions/WithAssignment/CallFunction.cs b/HydraScript.Lib/BackEnd/Instructions/WithAssignment/CallFunction.cs
@@ -15,7 +15,7 @@ public CallFunction(
         base(null, (null, null), "Call ")
     {
         _function = function;
-        _numberOfArguments = numberOfArguments + Convert.ToInt32(function.MethodOf != null);
+        _numberOfArguments = numberOfArguments;
         _hasReturnValue = hasReturnValue;
     }
 
@@ -38,15 +38,6 @@ public override IAddress Execute(VirtualMachine vm)
             i++;
         }
 
-        if (_function.MethodOf != null)
-        {
-            var obj = (Dictionary<string, object>)frame[_function.MethodOf];
-            foreach (var (key, value) in obj)
-            {
-                frame[key] = value;
-            }
-        }
-
         vm.CallStack.Push(new Call(Address, _function, args, Left));
         vm.Frames.Push(frame);
         return _function.Start;

diff --git a/HydraScript.Lib/BackEnd/Instructions/WithAssignment/Simple.cs b/HydraScript.Lib/BackEnd/Instructions/WithAssignment/Simple.cs
@@ -91,20 +91,6 @@ public override IAddress Execute(VirtualMachine vm)
             };
         }
 
-        if (vm.CallStack.Any())
-        {
-            var call = vm.CallStack.Peek();
-            var methodOf = call.To.MethodOf;
-            if (methodOf != null)
-            {
-                var methodOwner = (Dictionary<string, object>)frame[methodOf];
-                if (methodOwner.ContainsKey(Left))
-                {
-                    methodOwner[Left] = frame[Left];
-                }
-            }
-        }
-
         return Address.Next;
     }
 

diff --git a/HydraScript.Lib/BackEnd/VirtualMachine.cs b/HydraScript.Lib/BackEnd/VirtualMachine.cs
@@ -36,22 +36,15 @@ public override string ToString() =>
         $"{From} => {To.Start}: {To.Id}({string.Join(", ", Parameters.Select(x => $"{x.Id}: {x.Value}"))})";
 }
 
-public record FunctionInfo(string Id, string MethodOf = null)
+public record FunctionInfo(string Id)
 {
     public Label Start =>
         new($"Start_{this}");
 
     public Label End =>
         new($"End_{this}");
 
-    public string MethodOf { get; set; } = MethodOf;
-
-    private string CallId() =>
-        MethodOf == null
-            ? Id
-            : $"{MethodOf}.{Id}";
-
-    public override string ToString() => CallId();
+    public override string ToString() => Id;
 }
 
 public class Frame

diff --git a/HydraScript.Lib/IR/Ast/Impl/Nodes/Declarations/AfterTypesAreLoaded/FunctionDeclaration.cs b/HydraScript.Lib/IR/Ast/Impl/Nodes/Declarations/AfterTypesAreLoaded/FunctionDeclaration.cs
@@ -17,9 +17,6 @@ public class FunctionDeclaration : AfterTypesAreLoadedDeclaration
     public List<PropertyTypeValue> Arguments { get; }
     public BlockStatement Statements { get; }
 
-    public ObjectLiteral Object =>
-        Parent as ObjectLiteral;
-
     public FunctionDeclaration(
         IdentifierReference name,
         TypeValue returnTypeValue,

diff --git a/HydraScript.Lib/IR/Ast/Visitors/InstructionProvider.cs b/HydraScript.Lib/IR/Ast/Visitors/InstructionProvider.cs
@@ -98,9 +98,8 @@ public AddressedInstructions Visit(FunctionDeclaration visitable)
     {
         if (!visitable.Statements.Any())
             return new();
-
-        var objectId = visitable.Object?.Id;
-        var functionInfo = new FunctionInfo(visitable.Name, objectId);
+
+        var functionInfo = new FunctionInfo(visitable.Name);
 
         var result = new AddressedInstructions
         {

diff --git a/HydraScript.Tests/Unit/BackEnd/FunctionInfoTests.cs b/HydraScript.Tests/Unit/BackEnd/FunctionInfoTests.cs