Changeset 236 for branches/xpascal/Parsers/ParserPascal.pas

Timestamp:

Jun 29, 2023, 1:47:58 AM (17 months ago)

Author:

chronos

Message:

• Fixed: Var function parameters processed correctly for both user defined and internal functions.

File:

• branches/xpascal/Parsers/ParserPascal.pas (modified) (3 diffs)

branches/xpascal/Parsers/ParserPascal.pas

@@ -372 +372 @@
           if Assigned(TypeRef) then begin
             Func.ResultType := TypeRef;
-            Variable := TVariable.Create;
-            Variable.Name := 'Result';
-            Variable.TypeRef := TypeRef;
-            Variable.Internal := True;
-            Func.Block.Variables.Add(Variable);
           end else Error('Type ' + Token.Text + ' not found');
         end;
       end;
       Tokenizer.Expect(';', tkSpecialSymbol);
+      Func.InitVariables;
       if ParseBlock(Block, NewBlock, Func.Block) then begin
         Tokenizer.Expect(';', tkSpecialSymbol);
@@ -405 +401 @@
     end;
     Tokenizer.Expect(')', tkSpecialSymbol);
-    for I := 0 to Params.Count - 1 do begin
-      Variable := TVariable.Create;
-      Variable.Name := Params[I].Name;
-      Variable.TypeRef := Params[I].TypeRef;
-      Variable.Internal := True;
-      Block.Variables.Add(Variable);
-    end;
     Result := True;
   end;
@@ -463 +452 @@
         Proc.Params := FunctionParameters;
       end;
-
       Tokenizer.Expect(';', tkSpecialSymbol);
+      Proc.InitVariables;
       if ParseBlock(Block, NewBlock, Proc.Block) then begin
         Tokenizer.Expect(';', tkSpecialSymbol);