Changeset 221 for branches/interpreter2/USource.pas

Timestamp:

Nov 24, 2020, 6:19:17 PM (4 years ago)

Author:

chronos

Message:

• Fixed: Resolved remaining memory leaks.
• Modified: Generators moved to Generators subdirectory.
• Modified: PascalParser moved to Parsers subdirectory.

File:

• branches/interpreter2/USource.pas (modified) (17 diffs)

branches/interpreter2/USource.pas

@@ -154 +154 @@
     function GetField(Index: Integer): TField; override;
     procedure SetValue(Index: Integer; var Value); override;
+    destructor Destroy; override;
   end;
 
@@ -484 +485 @@
 destructor TReturn.Destroy;
 begin
-  Expression.Free;
-  inherited Destroy;
+  FreeAndNil(Expression);
+  inherited;
 end;
 
@@ -530 +531 @@
 destructor TSourceNodes.Destroy;
 begin
-  List.Free;
-  inherited Destroy;
+  FreeAndNil(List);
+  inherited;
 end;
 
@@ -588 +589 @@
   else if Index = 1 then TypeRef := TType(Value)
   else inherited;
+end;
+
+destructor TConstant.Destroy;
+begin
+  FreeAndNil(Value);
+  inherited;
 end;
 
@@ -722 +729 @@
 destructor TRepeatUntil.Destroy;
 begin
-  Expression.Free;
-  Commands.Free;
-  inherited Destroy;
+  FreeAndNil(Expression);
+  FreeAndNil(Commands);
+  inherited;
 end;
 
@@ -801 +808 @@
 destructor TForToDo.Destroy;
 begin
-  Command.Free;
-  ExpressionTo.Free;
-  ExpressionFrom.Free;
-  inherited Destroy;
+  FreeAndNil(Command);
+  FreeAndNil(ExpressionTo);
+  FreeAndNil(ExpressionFrom);
+  inherited;
 end;
 
@@ -868 +875 @@
 destructor TExpressionOperand.Destroy;
 begin
-  if Assigned(ConstantDirect) then ConstantDirect.Free;
+  if Assigned(ConstantDirect) then FreeAndNil(ConstantDirect);
+  if Assigned(FunctionCall) then FreeAndNil(FunctionCall);
 end;
 
@@ -933 +941 @@
 destructor TFunction.Destroy;
 begin
-  Block.Free;
-  Params.Free;
-  inherited Destroy;
+  FreeAndNil(Block);
+  FreeAndNil(Params);
+  inherited;
 end;
 
@@ -971 +979 @@
 destructor TType.Destroy;
 begin
-  Functions.Free;
-  inherited Destroy;
+  FreeAndNil(Functions);
+  inherited;
 end;
 
@@ -1033 +1041 @@
 destructor TExpressionOperation.Destroy;
 begin
-  Items.Free;
-  inherited Destroy;
+  FreeAndNil(Items);
+  inherited;
 end;
 
@@ -1079 +1087 @@
 begin
   Variable := nil;
-  Expression.Free;
-  inherited Destroy;
+  FreeAndNil(Expression);
+  inherited;
 end;
 
@@ -1123 +1131 @@
 destructor TIfThenElse.Destroy;
 begin
-  Expression.Free;
-  CommandThen.Free;
-  CommandElse.Free;
-  inherited Destroy;
+  FreeAndNil(Expression);
+  FreeAndNil(CommandThen);
+  FreeAndNil(CommandElse);
+  inherited;
 end;
 
@@ -1165 +1173 @@
 destructor TWhileDo.Destroy;
 begin
-  Expression.Free;
-  Command.Free;
-  inherited Destroy;
+  FreeAndNil(Expression);
+  FreeAndNil(Command);
+  inherited;
 end;
 
@@ -1205 +1213 @@
 destructor TFunctionCall.Destroy;
 begin
-  Params.Free;
-  inherited Destroy;
+  FreeAndNil(Params);
+  inherited;
 end;
 
@@ -1349 +1357 @@
 destructor TBlock.Destroy;
 begin
-  BeginEnd.Free;
-  Types.Free;
-  Variables.Free;
-  Constants.Free;
-  Functions.Free;
-  inherited Destroy;
+  FreeAndNil(BeginEnd);
+  FreeAndNil(Types);
+  FreeAndNil(Variables);
+  FreeAndNil(Constants);
+  FreeAndNil(Functions);
+  inherited;
 end;
 
@@ -1394 +1402 @@
 destructor TBeginEnd.Destroy;
 begin
-  Commands.Free;
-  inherited Destroy;
+  FreeAndNil(Commands);
+  inherited;
 end;
 
@@ -1439 +1447 @@
 destructor TProgram.Destroy;
 begin
-  Block.Free;
-  SystemBlock.Free;
-  inherited Destroy;
+  FreeAndNil(Block);
+  FreeAndNil(SystemBlock);
+  inherited;
 end;