Changeset 221 for branches/interpreter2/UExecutor.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/UExecutor.pas (modified) (10 diffs)

branches/interpreter2/UExecutor.pas

@@ -138 +138 @@
 destructor TExecutorFunction.Destroy;
 begin
-  Block.Free;
-  inherited Destroy;
+  FreeAndNil(Block);
+  inherited;
 end;
 
@@ -151 +151 @@
 destructor TExecutorVariable.Destroy;
 begin
-  Value.Free;
-  inherited Destroy;
+  FreeAndNil(Value);
+  inherited;
 end;
 
@@ -164 +164 @@
 destructor TExecutorType.Destroy;
 begin
-  Functions.Free;
-  inherited Destroy;
+  FreeAndNil(Functions);
+  inherited;
 end;
 
@@ -273 +273 @@
 destructor TExecutorBlock.Destroy;
 begin
-  Variables.Free;
-  Functions.Free;
-  Types.Free;
-  inherited Destroy;
+  FreeAndNil(Variables);
+  FreeAndNil(Functions);
+  FreeAndNil(Types);
+  inherited;
 end;
 
@@ -513 +513 @@
 var
   Value: TValue;
+  BoolValue: Boolean;
 begin
   while True do begin
     Value := ExecuteExpression(Block, WhileDo.Expression);
     if Value is TValueBoolean then begin
-      if not TValueBoolean(Value).Value then Break;
+      BoolValue := TValueBoolean(Value).Value;
+      Value.Free;
+      if not BoolValue then Break;
       ExecuteCommand(Block, WhileDo.Command);
       if WhileDo.DoContinue then begin
@@ -528 +531 @@
       end;
     end else raise Exception.Create('Expected boolean value.');
-    Value.Free;
   end;
 end;
@@ -537 +539 @@
   Value: TValue;
   I: Integer;
+  BoolValue: Boolean;
 begin
   while True do begin
@@ -552 +555 @@
     Value := ExecuteExpression(Block, RepeatUntil.Expression);
     if Value is TValueBoolean then begin
-      if TValueBoolean(Value).Value then Break;
+      BoolValue := TValueBoolean(Value).Value;
+      Value.Free;
+      if BoolValue then Break;
     end else raise Exception.Create('Expected boolean value.');
-    Value.Free;
   end;
 end;
@@ -654 +658 @@
       ExecuteBlock(Block, FunctionCall.FunctionDef.Block, ExecutorFunction.Block);
       ExecutorVariable := ExecutorFunction.Block.Variables.SearchByVariable(TVariable(FunctionCall.FunctionDef.Block.Variables.SearchByName('Result')));
-      Result := ExecutorVariable.Value;
+      Result := ExecutorVariable.Value.Clone;
     end;
   end else raise Exception.Create('No executor for ' + FunctionCall.FunctionDef.Name + ' function.');
@@ -706 +710 @@
     raise Exception.Create('Missing operator function ' + FuncName + ' for type ' + Expression.TypeRef.Name);
 
-  Result := Expression.TypeRef.ValueClass.Create;
-
   SetLength(Params, Expression.Items.Count);
   for I := 0 to Expression.Items.Count - 1 do begin