Changeset 201 for branches/interpreter2/USource.pas

Timestamp:

Apr 16, 2020, 7:40:38 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Memory leaks.

Location:

branches/interpreter2

Files:

• . (modified) (1 prop)
• USource.pas (modified) (8 diffs)

branches/interpreter2/USource.pas

@@ -30 +30 @@
   TConstants = class(TObjectList)
     function SearchByName(Name: string): TConstant;
+    function AddNew(Name: string): TConstant;
   end;
 
@@ -66 +67 @@
 
   TExpression = class
-    Variable: TVariable;
-    Constant: TConstant;
+    VariableRef: TVariable;
+    ConstantRef: TConstant;
     FunctionCall: TFunctionCall;
   end;
@@ -73 +74 @@
   TExpressions = class(TObjectList)
   end;
+
+  { TAssignment }
 
   TAssignment = class(TCommand)
     Variable: TVariable;
     Expression: TExpression;
-  end;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  { TIfThenElse }
 
   TIfThenElse = class(TCommand)
@@ -83 +90 @@
     CommandThen: TCommand;
     CommandElse: TCommand;
-  end;
+    constructor Create;
+    destructor Destroy; override;
+  end;
+
+  { TWhileDo }
 
   TWhileDo = class(TCommand)
     Expression: TExpression;
     Command: TCommand;
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -98 +111 @@
     Functions: TFunctions;
     BeginEnd: TBeginEnd;
+    procedure Clear;
     function GetFunction(Name: string): TFunction;
     constructor Create;
@@ -116 +130 @@
 implementation
 
+{ TAssignment }
+
+constructor TAssignment.Create;
+begin
+  Variable := nil;
+  Expression := TExpression.Create;
+end;
+
+destructor TAssignment.Destroy;
+begin
+  Variable := nil;
+  Expression.Free;
+  inherited Destroy;
+end;
+
+{ TIfThenElse }
+
+constructor TIfThenElse.Create;
+begin
+  Expression := TExpression.Create;
+  CommandThen := TCommand.Create;
+  CommandElse := TCommand.Create;
+end;
+
+destructor TIfThenElse.Destroy;
+begin
+  Expression.Free;
+  CommandThen.Free;
+  CommandElse.Free;
+  inherited Destroy;
+end;
+
+{ TWhileDo }
+
+constructor TWhileDo.Create;
+begin
+  Expression := TExpression.Create;
+  Command := TCommand.Create;
+end;
+
+destructor TWhileDo.Destroy;
+begin
+  Expression.Free;
+  Command.Free;
+  inherited Destroy;
+end;
+
 { TFunctionCall }
 
@@ -160 +221 @@
 end;
 
+function TConstants.AddNew(Name: string): TConstant;
+begin
+  Result := TConstant.Create;
+  Result.Name := Name;
+  Add(Result);
+end;
+
 { TVariables }
 
@@ -174 +242 @@
 { TBlock }
 
+procedure TBlock.Clear;
+begin
+  Functions.Clear;
+  Constants.Clear;
+  Variables.Clear;
+end;
+
 function TBlock.GetFunction(Name: string): TFunction;
 begin