Changeset 230 for branches/xpascal/Source.pas

Timestamp:

Jun 26, 2023, 12:08:45 PM (17 months ago)

Author:

chronos

Message:

• Added: Var function parameters support.
• Added: Read and ReadLn procedures support.
• Added: Interpreter now prints into console form.

File:

• branches/xpascal/Source.pas (modified) (11 diffs)

branches/xpascal/Source.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Contnrs;
+  Classes, SysUtils, Generics.Collections;
 
 type
@@ -24 +24 @@
   end;
 
-  TFields = class(TObjectList)
+  TFields = class(TObjectList<TField>)
   end;
 
@@ -50 +50 @@
   end;
 
-  { TSourceNodes }
-
-  TSourceNodes = class(TSourceNode)
+  { TSourceNodeList }
+
+  TSourceNodeList<T> = class(TSourceNode)
   private
     Parent: TSourceNode;
     function GetCount: Integer;
-    function GetItem(Index: Integer): TObject;
-    procedure SetItem(Index: Integer; AValue: TObject);
-  public
-    List: TObjectList;
+    function GetItem(Index: Integer): T;
+    procedure SetItem(Index: Integer; AValue: T);
+  public
+    List: TObjectList<TSourceNode>;
     procedure Clear;
-    function Add(AObject: TObject): Integer;
+    function Add(AObject: T): Integer;
     constructor Create;
     destructor Destroy; override;
-    property Items[Index: Integer]: TObject read GetItem write SetItem; default;
+    property Items[Index: Integer]: T read GetItem write SetItem; default;
     property Count: Integer read GetCount;
   end;
@@ -115 +115 @@
   { TTypes }
 
-  TTypes = class(TSourceNodes)
+  TTypes = class(TSourceNodeList<TType>)
     function SearchByName(Name: string): TType;
     function AddNew(Name: string): TType;
@@ -136 +136 @@
   { TVariables }
 
-  TVariables = class(TSourceNodes)
+  TVariables = class(TSourceNodeList<TVariable>)
     function SearchByName(Name: string): TVariable;
   end;
@@ -157 +157 @@
   { TConstants }
 
-  TConstants = class(TSourceNodes)
+  TConstants = class(TSourceNodeList<TConstant>)
     function SearchByName(Name: string): TConstant;
     function AddNew(Name: string): TConstant;
   end;
+
+  TFunctionParamKind = (pkNormal, pkVar, pkConst);
 
   TFunctionParameter = class(TSourceNode)
     Name: string;
     TypeRef: TType;
+    Kind: TFunctionParamKind;
   end;
 
   { TFunctionParameters }
 
-  TFunctionParameters = class(TSourceNodes)
+  TFunctionParameters = class(TSourceNodeList<TFunctionParameter>)
     function SearchByName(Name: string): TFunctionParameter;
     function AddNew(Name: string; TypeRef: TType): TFunctionParameter;
@@ -195 +198 @@
   { TFunctions }
 
-  TFunctions = class(TSourceNodes)
+  TFunctions = class(TSourceNodeList<TFunction>)
     ParentType: TType;
     function SearchByName(Name: string): TFunction;
@@ -204 +207 @@
   end;
 
-  TCommands = class(TSourceNodes)
+  TCommands = class(TSourceNodeList<TCommand>)
   end;
 
@@ -302 +305 @@
   end;
 
-  TExpressions = class(TSourceNodes)
+  TExpressions = class(TSourceNodeList<TExpression>)
   end;
 
@@ -565 +568 @@
 end;
 
-{ TSourceNodes }
-
-function TSourceNodes.GetCount: Integer;
+{ TSourceNodeList }
+
+function TSourceNodeList<T>.GetCount: Integer;
 begin
   Result := List.Count;
 end;
 
-function TSourceNodes.GetItem(Index: Integer): TObject;
-begin
-  Result := List[Index];
-end;
-
-procedure TSourceNodes.SetItem(Index: Integer; AValue: TObject);
+function TSourceNodeList<T>.GetItem(Index: Integer): T;
+begin
+  Result := T(List[Index]);
+end;
+
+procedure TSourceNodeList<T>.SetItem(Index: Integer; AValue: T);
 begin
   List[Index] := AValue;
 end;
 
-procedure TSourceNodes.Clear;
+procedure TSourceNodeList<T>.Clear;
 begin
   List.Clear;
 end;
 
-function TSourceNodes.Add(AObject: TObject): Integer;
+function TSourceNodeList<T>.Add(AObject: T): Integer;
 begin
   Result := List.Add(AObject);
 end;
 
-constructor TSourceNodes.Create;
-begin
-  List := TObjectList.Create;
-end;
-
-destructor TSourceNodes.Destroy;
+constructor TSourceNodeList<T>.Create;
+begin
+  List := TObjectList<TSourceNode>.Create;
+end;
+
+destructor TSourceNodeList<T>.Destroy;
 begin
   FreeAndNil(List);
@@ -1095 +1098 @@
 procedure TExpressionOperation.SetValue(Index: Integer; var Value);
 begin
-  Items[Index] := TObject(Value);
+  Items[Index] := TExpression(Value);
 end;