Changeset 235 for branches/xpascal/Executor.pas

Timestamp:

Jun 27, 2023, 10:09:21 AM (17 months ago)

Author:

chronos

Message:

• Modified: Improved function var parameter handling.
• Modified: Code cleanup.

File:

• branches/xpascal/Executor.pas (modified) (13 diffs)

branches/xpascal/Executor.pas

@@ -163 +163 @@
     procedure ExecuteBlock(ParentBlock: TExecutorBlock; Block: TBlock; ExistingBlock: TExecutorBlock = nil);
     function ExecuteFunctionCall(Block: TExecutorBlock; FunctionCall: TFunctionCall): TValue;
-    function ExecuteProcedureCall(Block: TExecutorBlock; ProcedureCall: TProcedureCall): TValue;
+    procedure ExecuteProcedureCall(Block: TExecutorBlock; ProcedureCall: TProcedureCall);
     procedure ExecuteAssignment(Block: TExecutorBlock; Assignment: TAssignment);
     function ExecuteExpression(Block: TExecutorBlock; Expression: TExpression): TValue;
@@ -195 +195 @@
 begin
   I := 0;
-  while (I < Count) and (TExecutorProcedure(Items[I]).ProcedureDef <> ProcedureDef) do Inc(I);
-  if I < Count then Result := TExecutorProcedure(Items[I])
+  while (I < Count) and (Items[I].ProcedureDef <> ProcedureDef) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -275 +275 @@
 begin
   I := 0;
-  while (I < Count) and (TExecutorType(Items[I]).TypeRef <> TypeRef) do Inc(I);
-  if I < Count then Result := TExecutorType(Items[I])
+  while (I < Count) and (Items[I].TypeRef <> TypeRef) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -295 +295 @@
 begin
   I := 0;
-  while (I < Count) and (TExecutorFunction(Items[I]).FunctionDef <> FunctionDef) do Inc(I);
-  if I < Count then Result := TExecutorFunction(Items[I])
+  while (I < Count) and (Items[I].FunctionDef <> FunctionDef) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -314 +314 @@
 begin
   I := 0;
-  while (I < Count) and (TExecutorVariable(Items[I]).Variable <> Variable) do Inc(I);
-  if I < Count then Result := TExecutorVariable(Items[I])
+  while (I < Count) and (Items[I].Variable <> Variable) do Inc(I);
+  if I < Count then Result := Items[I]
     else Result := nil;
 end;
@@ -634 +634 @@
   J: Integer;
   ExecutorFunction: TExecutorFunction;
+  ExecutorProcedure: TExecutorProcedure;
   ExecutorType: TExecutorType;
 begin
@@ -723 +724 @@
     end;
   end;
-  for I := 0 to Block.Variables.Count - 1 do
+
+  for I := 0 to Block.Variables.Count - 1 do begin
     ExecutorBlock.Variables.AddNew(TVariable(Block.Variables[I]));
+  end;
+
   for I := 0 to Block.Functions.Count - 1 do begin
     ExecutorFunction := ExecutorBlock.Functions.AddNew(TFunction(Block.Functions[I]));
-    if ExecutorFunction.FunctionDef.Name = 'Write' then begin
-      ExecutorFunction.Callback := ExecuteWrite;
-    end else
-    if ExecutorFunction.FunctionDef.Name = 'WriteLn' then begin
-      ExecutorFunction.Callback := ExecuteWriteLn;
-    end else
-    if ExecutorFunction.FunctionDef.Name = 'Read' then begin
-      ExecutorFunction.Callback := ExecuteRead;
-    end else
-    if ExecutorFunction.FunctionDef.Name = 'ReadLn' then begin
-      ExecutorFunction.Callback := ExecuteReadLn;
-    end else
     if ExecutorFunction.FunctionDef.Name = 'IntToStr' then begin
       ExecutorFunction.Callback := ExecuteIntToStr;
@@ -750 +742 @@
     if ExecutorFunction.FunctionDef.Name = 'StrToBool' then begin
       ExecutorFunction.Callback := ExecuteStrToBool;
+    end;
+  end;
+
+  for I := 0 to Block.Procedures.Count - 1 do begin
+    ExecutorProcedure := ExecutorBlock.Procedures.AddNew(TProcedure(Block.Procedures[I]));
+    if ExecutorProcedure.ProcedureDef.Name = 'Write' then begin
+      ExecutorProcedure.Callback := ExecuteWrite;
+    end else
+    if ExecutorProcedure.ProcedureDef.Name = 'WriteLn' then begin
+      ExecutorProcedure.Callback := ExecuteWriteLn;
+    end else
+    if ExecutorProcedure.ProcedureDef.Name = 'Read' then begin
+      ExecutorProcedure.Callback := ExecuteRead;
+    end else
+    if ExecutorProcedure.ProcedureDef.Name = 'ReadLn' then begin
+      ExecutorProcedure.Callback := ExecuteReadLn;
     end;
   end;
@@ -946 +954 @@
       Result := ExecutorFunction.Callback(Params);
       for I := 0 to FunctionCall.Params.Count - 1 do begin
-        //if FunctionCall.Params[I].
         Params[I].Free;
       end;
     end else begin
       InitExecutorBlock(ExecutorFunction.Block, FunctionCall.FunctionDef.Block);
+
+      // Clean variables
       for I := 0 to FunctionCall.Params.Count - 1 do begin
-        Variable := FunctionCall.FunctionDef.Block.Variables.SearchByName(TFunctionParameter(FunctionCall.FunctionDef.Params[I]).Name);
-        ExecutorVariable := ExecutorFunction.Block.Variables.SearchByVariable(Variable);
-        ExecutorVariable.Value.Free;
-        ExecutorVariable.Value := ExecuteExpression(Block, TExpression(FunctionCall.Params[I]));
+        if FunctionCall.FunctionDef.Params[I].Kind = pkVar then begin
+          Variable := TExpressionOperand(FunctionCall.Params[I]).VariableRef;
+          ExecutorVariable := Block.Variables.SearchByVariable(Variable);
+          ExecutorFunction.Block.Variables[I] := ExecutorVariable;
+        end else begin
+          Variable := FunctionCall.FunctionDef.Block.Variables.SearchByName(
+            TFunctionParameter(FunctionCall.FunctionDef.Params[I]).Name);
+          ExecutorVariable := ExecutorFunction.Block.Variables.SearchByVariable(Variable);
+          ExecutorVariable.Value.Free;
+          ExecutorVariable.Value := ExecuteExpression(Block, TExpression(FunctionCall.Params[I]));
+        end;
       end;
+
       ExecuteBlock(Block, FunctionCall.FunctionDef.Block, ExecutorFunction.Block);
       ExecutorVariable := ExecutorFunction.Block.Variables.SearchByVariable(TVariable(FunctionCall.FunctionDef.Block.Variables.SearchByName('Result')));
@@ -964 +981 @@
 end;
 
-function TExecutor.ExecuteProcedureCall(Block: TExecutorBlock;
-  ProcedureCall: TProcedureCall): TValue;
+procedure TExecutor.ExecuteProcedureCall(Block: TExecutorBlock;
+  ProcedureCall: TProcedureCall);
 var
   ExecutorProcedure: TExecutorProcedure;
@@ -973 +990 @@
   Variable: TVariable;
 begin
-  Result := nil;
   ExecutorProcedure := Block.GetProcedure(ProcedureCall.ProcedureDef);
   if Assigned(ExecutorProcedure) then begin
@@ -989 +1005 @@
         else Params[I].Value := ExecuteExpression(Block, ProcedureCall.Params[I]);
       end;
-      Result := ExecutorProcedure.Callback(Params);
+      ExecutorProcedure.Callback(Params);
       for I := 0 to ProcedureCall.Params.Count - 1 do begin
-        //if FunctionCall.Params[I].
         Params[I].Free;
       end;
     end else begin
       InitExecutorBlock(ExecutorProcedure.Block, ProcedureCall.ProcedureDef.Block);
+
+      // Clean variables
       for I := 0 to ProcedureCall.Params.Count - 1 do begin
-        Variable := ProcedureCall.ProcedureDef.Block.Variables.SearchByName(
-          TFunctionParameter(ProcedureCall.ProcedureDef.Params[I]).Name);
-        ExecutorVariable := ExecutorProcedure.Block.Variables.SearchByVariable(Variable);
-        ExecutorVariable.Value.Free;
-        ExecutorVariable.Value := ExecuteExpression(Block, TExpression(ProcedureCall.Params[I]));
+        if ProcedureCall.ProcedureDef.Params[I].Kind = pkVar then begin
+          Variable := TExpressionOperand(ProcedureCall.Params[I]).VariableRef;
+          ExecutorVariable := Block.Variables.SearchByVariable(Variable);
+          ExecutorProcedure.Block.Variables[I].Variable := Variable;
+          ExecutorProcedure.Block.Variables[I].Value := ExecutorVariable.Value;
+        end else begin
+          Variable := ProcedureCall.ProcedureDef.Block.Variables.SearchByName(
+            TFunctionParameter(ProcedureCall.ProcedureDef.Params[I]).Name);
+          ExecutorVariable := ExecutorProcedure.Block.Variables.SearchByVariable(Variable);
+          ExecutorVariable.Value.Free;
+          ExecutorVariable.Value := ExecuteExpression(Block, TExpression(ProcedureCall.Params[I]));
+        end;
       end;
+
       ExecuteBlock(Block, ProcedureCall.ProcedureDef.Block, ExecutorProcedure.Block);
-      ExecutorVariable := ExecutorProcedure.Block.Variables.SearchByVariable(
-        TVariable(ProcedureCall.ProcedureDef.Block.Variables.SearchByName('Result')));
-      Result := ExecutorVariable.Value.Clone;
     end;
   end else raise Exception.Create('No executor for ' + ProcedureCall.ProcedureDef.Name + ' function.');
@@ -1022 +1044 @@
   Variable := Block.GetVariable(Assignment.Variable);
   ExecutorFunction := Block.GetTypeFunction(Assignment.Variable.TypeRef, '_Assign');
-  if Assignment.Variable.TypeRef = Assignment.Expression.GetType then begin;
+  if Assignment.Variable.TypeRef = Assignment.Expression.GetType then begin
     SetLength(Params, 1);
     Params[0] := TExecutorFunctionCallbackParam.Create;