Changeset 241 for oup/current/FileClasses/_DataTypes.pas

Timestamp:

Jul 18, 2007, 12:27:16 AM (17 years ago)

Author:

alloc

Message:

 

File:

• oup/current/FileClasses/_DataTypes.pas (modified) (25 diffs)

oup/current/FileClasses/_DataTypes.pas

@@ -10 +10 @@
   
   TDataField = class(TTreeElement)
-      function GetChildCount: Integer; override;
-      function GetChild(ID: Integer): TTreeElement; override;
-      function GetCaption: String; override;
     protected
       FOffset: Integer;
       FName:   String;
+      FType:   String;
       FDescription: String;
       FDataLength: Integer;
@@ -22 +20 @@
       FChanged: Boolean;
       FExtraArgs: array of TVarRec;
+      function GetChildCount: Integer; override;
+      function GetChild(ID: Integer): TTreeElement; override;
+      function GetCaption: String; override;
+      function GetType: String; override;
       function GetValueAsString: String; virtual;
     public
@@ -47 +49 @@
 
   TBlock = class(TContainer)
-    private
+    protected
       FDataFields: array of TDataField;
       function GetChildCount: Integer; override;
@@ -67 +69 @@
 
   TInt = class(TDataField)
-    private
+    protected
       FInt: Integer;
       function GetValueAsString: String; override;
@@ -80 +82 @@
 
   TFloat = class(TDataField)
-    private
+    protected
       FFloat: Single;
       function GetValueAsString: String; override;
@@ -93 +95 @@
 
   TBitSet = class(TDataField)
-    private
+    protected
       FBits: Byte;
       FNames: TStringList;
@@ -107 +109 @@
 
   TLevelID = class(TDataField)
-    private
+    protected
       FLevelID: Integer;
       function GetValueAsString: String; override;
@@ -120 +122 @@
 
   TFileID = class(TDataField)
-    private
+    protected
       FFileID: Integer;
       function GetValueAsString: String; override;
@@ -133 +135 @@
 
   TDatLink = class(TDataField)
-    private
+    protected
+      FPosExts: String;
       function GetTarget: TObject; virtual; abstract;
     public
+      property PosExts: String read FPosExts;
       property TargetFile: TObject read GetTarget;
   end;
@@ -141 +145 @@
 
   TLinkByID = class(TDatLink)
+    protected
+      FFileID: Integer;
       function GetChildCount: Integer; override;
       function GetChild(ID: Integer): TTreeElement; override;
-    private
-      FFileID: Integer;
-      FPosExts: String;
       function GetValueAsString: String; override;
       function GetTarget: TObject; override;
@@ -158 +161 @@
 
   TString = class(TDataField)
-    private
+    protected
       FString: String;
       function GetValueAsString: String; override;
@@ -171 +174 @@
 
   TArray = class(TContainer)
-    private
+    protected
       FDataFields: array of TBlock;
       FTemplate: TBlock;
@@ -197 +200 @@
 
   TRawLink = class(TDataField)
-    private
+    protected
       FRawAddress: Integer;
+      FRawType:    String;
+      FSep:        Boolean;
       function GetValueAsString: String; override;
     public
-      // ExtraArgs: keine
-      constructor Create(ParentFile: TObject; ParentBlock: TContainer;
-          Name, Description: String; ExtraArgs: array of const); override;
-      procedure Update(Offset, Length: Integer); override;
-      procedure WriteData(stream: TStream); override;
+      // ExtraArgs: String: RawType; Bool: Sep
+      constructor Create(ParentFile: TObject; ParentBlock: TContainer;
+          Name, Description: String; ExtraArgs: array of const); override;
+      procedure Update(Offset, Length: Integer); override;
+      procedure WriteData(stream: TStream); override;
+
+      property RawType: String read FRawType;
   end;
 
 
   TUnused = class(TDataField)
-    private
+    protected
       function GetValueAsString: String; override;
     public
@@ -268 +275 @@
 end;
 
+function TDataField.GetType: String;
+begin
+  Result := FType;
+end;
+
 function TDataField.GetValueAsString: String;
 begin
@@ -280 +292 @@
   inherited Create(ParentFile, ParentBlock, Name, Description, ExtraArgs);
   FDataLength := ExtraArgs[0].VInteger;
+  FType := 'String[' + IntToStr(FDataLength) + ']';
 end;
 
@@ -325 +338 @@
   inherited Create(ParentFile, ParentBlock, Name, Description, ExtraArgs);
   FDataLength := ExtraArgs[0].VInteger;
+  FType := 'Int' + IntToStr(FDataLength * 8);
   FInt := 0;
 end;
@@ -364 +378 @@
   inherited Create(ParentFile, ParentBlock, Name, Description, ExtraArgs);
   FCounterSize := ExtraArgs[0].VInteger;
+  FType := '';
   if Length(ExtraArgs) = 2 then
     FBlockCount := ExtraArgs[1].VInteger
@@ -521 +536 @@
 begin
   inherited Create(ParentFile, ParentBlock, Name, Description, ExtraArgs);
+  FType := '';
 end;
 
@@ -593 +609 @@
   inherited Create(ParentFile, ParentBlock, Name, Description, ExtraArgs);
   FDataLength := 4;
+  FType := 'LevelID';
   FLevelID := 0;
 end;
@@ -628 +645 @@
   inherited Create(ParentFile, ParentBlock, Name, Description, ExtraArgs);
   FDataLength := 4;
+  FType := 'FileID';
   FFileID := -1;
 end;
@@ -673 +691 @@
     vtAnsiString: FPosExts := String(ExtraArgs[0].VAnsiString);
   end;
+  FType := 'LinkByID(' + FPosExts + ')';
   FFileID := -1;
 end;
@@ -740 +759 @@
 begin
   inherited Create(ParentFile, ParentBlock, Name, Description, ExtraArgs);
+  case ExtraArgs[0].VType of
+    vtChar: FRawType := ExtraArgs[0].VChar;
+    vtAnsiString: FRawType := String(ExtraArgs[0].VAnsiString);
+  end;
+  if Length(ExtraArgs) > 1 then
+    FSep := ExtraArgs[1].VBoolean;
+  FType := 'RawLink(' + FRawType + ')';
   FDataLength := 4;
 end;
@@ -774 +800 @@
   inherited Create(ParentFile, ParentBlock, Name, Description, ExtraArgs);
   FDataLength := ExtraArgs[0].VInteger;
+  FType := 'Unused';
 end;
 
@@ -813 +840 @@
     end;
   FDataLength := 1;
+  FType := 'BitSet';
   FBits := 0;
 end;
@@ -854 +882 @@
   inherited Create(ParentFile, ParentBlock, Name, Description, ExtraArgs);
   FDataLength := 4;
+  FType := 'Float';
   FFloat := 0;
 end;