Changeset 231 for branches/xpascal/Source.pas

Timestamp:

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

Author:

chronos

Message:

• Modified: SourceNode classes moved into separate unit.

File:

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

branches/xpascal/Source.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Generics.Collections;
+  Classes, SysUtils, Generics.Collections, SourceNode;
 
 type
@@ -11 +11 @@
   TBeginEnd = class;
   TBlock = class;
-
-  TDataType = (dtNone, dtString, dtBoolean, dtInteger, dtFloat, dtColor,
-    dtTime, dtDate, dtDateTime, dtEnumeration, dtObject);
-
-  { TField }
-
-  TField = class
-    Index: Integer;
-    DataType: TDataType;
-    Name: string;
-    constructor Create(ADataType: TDataType; AName: string);
-  end;
-
-  TFields = class(TObjectList<TField>)
-  end;
-
-  { TSourceNode }
-
-  TSourceNode = class
-  private
-    function GetFieldsCount: Integer; virtual;
-  public
-    Parent: TSourceNode;
-    function GetField(Index: Integer): TField; virtual;
-    procedure GetValue(Index: Integer; out Value); virtual;
-    function GetValueInteger(Index: Integer): Integer;
-    function GetValueString(Index: Integer): string;
-    function GetValueBoolean(Index: Integer): Boolean;
-    function GetValueObject(Index: Integer): TObject;
-    function GetValueAsText(Index: Integer): string;
-    procedure SetValue(Index: Integer; var Value); virtual;
-    procedure SetValueInteger(Index: Integer; Value: Integer);
-    procedure SetValueString(Index: Integer; Value: string);
-    procedure SetValueBoolean(Index: Integer; Value: Boolean);
-    procedure SetValueObject(Index: Integer; Value: TObject);
-    function GetFields: TFields;
-    property FieldsCount: Integer read GetFieldsCount;
-  end;
-
-  { TSourceNodeList }
-
-  TSourceNodeList<T> = class(TSourceNode)
-  private
-    Parent: TSourceNode;
-    function GetCount: Integer;
-    function GetItem(Index: Integer): T;
-    procedure SetItem(Index: Integer; AValue: T);
-  public
-    List: TObjectList<TSourceNode>;
-    procedure Clear;
-    function Add(AObject: T): Integer;
-    constructor Create;
-    destructor Destroy; override;
-    property Items[Index: Integer]: T read GetItem write SetItem; default;
-    property Count: Integer read GetCount;
-  end;
 
   { TValue }
@@ -453 +397 @@
 
   const
-    DataTypeStr: array[TDataType] of string = ('None', 'String', 'Boolean',
-      'Integer', 'Float', 'Color', 'Time', 'Date', 'DateTime', 'Enumeration',
-      'Reference');
     ExpressionOperatorText: array[TExpressionOperator] of string = ('', '+',
       '-', '*', '/', 'div', 'mod', 'and', 'xor', 'or', 'shl',
@@ -471 +412 @@
 resourcestring
   SIndexError = 'Index error';
-  SUnsupportedValueIndex = 'Unsupported value index %d';
-  SUnsupportedDataType = 'Unsupported field value data type %s';
-  SYes = 'Yes';
-  SNo = 'No';
 
 function GetOperatorByName(Name: string): TExpressionOperator;
@@ -560 +497 @@
 end;
 
-{ TField }
-
-constructor TField.Create(ADataType: TDataType; AName: string);
-begin
-  DataType := ADataType;
-  Name := AName;
-end;
-
-{ TSourceNodeList }
-
-function TSourceNodeList<T>.GetCount: Integer;
-begin
-  Result := List.Count;
-end;
-
-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 TSourceNodeList<T>.Clear;
-begin
-  List.Clear;
-end;
-
-function TSourceNodeList<T>.Add(AObject: T): Integer;
-begin
-  Result := List.Add(AObject);
-end;
-
-constructor TSourceNodeList<T>.Create;
-begin
-  List := TObjectList<TSourceNode>.Create;
-end;
-
-destructor TSourceNodeList<T>.Destroy;
-begin
-  FreeAndNil(List);
-  inherited;
-end;
-
 { TVariable }
 
@@ -666 +557 @@
   FreeAndNil(Value);
   inherited;
-end;
-
-{ TSourceNode }
-
-procedure TSourceNode.GetValue(Index: Integer; out Value);
-begin
-  raise Exception.Create(Format(SUnsupportedValueIndex, [Index]));
-end;
-
-function TSourceNode.GetFieldsCount: Integer;
-begin
-  Result := 0;
-end;
-
-function TSourceNode.GetField(Index: Integer): TField;
-begin
-  Result := nil;
-  raise Exception.Create(Format(SUnsupportedValueIndex, [Index]));
-end;
-
-procedure TSourceNode.SetValue(Index: Integer; var Value);
-begin
-  raise Exception.Create(Format(SUnsupportedValueIndex, [Index]));
-end;
-
-function TSourceNode.GetValueInteger(Index: Integer): Integer;
-begin
-  GetValue(Index, Result);
-end;
-
-function TSourceNode.GetValueString(Index: Integer): string;
-begin
-  GetValue(Index, Result);
-end;
-
-function TSourceNode.GetValueBoolean(Index: Integer): Boolean;
-begin
-  GetValue(Index, Result);
-end;
-
-function TSourceNode.GetValueObject(Index: Integer): TObject;
-begin
-  GetValue(Index, Result);
-end;
-
-function TSourceNode.GetValueAsText(Index: Integer): string;
-var
-  Field: TField;
-  Item: TObject;
-begin
-  Field := GetField(Index);
-  try
-    if Field.DataType = dtInteger then Result := IntToStr(GetValueInteger(Index))
-    else if Field.DataType = dtString then Result := GetValueString(Index)
-    //else if Field.DataType = dtEnumeration then Result := Field.EnumStates[Integer(GetValueEnumeration(Index))]
-    else if Field.DataType = dtObject then begin
-      Item := TObject(GetValueObject(Index));
-      if Assigned(Item) then Result := Item.ClassName
-        else Result := '';
-    end else if Field.DataType = dtBoolean then begin
-      if GetValueBoolean(Index) then Result := SYes else Result := SNo;
-    end else
-      raise Exception.Create(Format(SUnsupportedDataType, [DataTypeStr[Field.DataType]]));
-  finally
-    Field.Free;
-  end;
-end;
-
-
-procedure TSourceNode.SetValueInteger(Index: Integer; Value: Integer);
-begin
-  SetValue(Index, Value);
-end;
-
-procedure TSourceNode.SetValueString(Index: Integer; Value: string);
-begin
-  SetValue(Index, Value);
-end;
-
-procedure TSourceNode.SetValueBoolean(Index: Integer; Value: Boolean);
-begin
-  SetValue(Index, Value);
-end;
-
-procedure TSourceNode.SetValueObject(Index: Integer; Value: TObject);
-begin
-  SetValue(Index, Value);
-end;
-
-function TSourceNode.GetFields: TFields;
-var
-  I: Integer;
-begin
-  Result := TFields.Create;
-  for I := 0 to GetFieldsCount - 1 do
-    Result.Add(GetField(I));
 end;