Browse Source

* Some formatting fixes, make sure string argument is const where possible

Michaël Van Canneyt 7 months ago
parent
commit
2f086e1ec2

+ 11 - 11
packages/fcl-yaml/src/fpyaml.data.pp

@@ -56,8 +56,8 @@ Type
     class function allowTag : Boolean; virtual;
     class function DefaultTag : TYAMLString; virtual;
   Public
-    constructor create(); virtual;
-    constructor create(const aAnchor : TYAMLString; const aTag : TYAMLString = '');
+    constructor Create(); virtual;
+    constructor Create(const aAnchor : TYAMLString; const aTag : TYAMLString = '');
     Function Clone : TYAMLData; virtual; abstract;
     Function Equals(aData : TYAMLData; aStrict : Boolean = False) : Boolean; overload;virtual;
     Function GetEnumerator: TYAMLEnumerator; virtual; abstract;
@@ -188,8 +188,8 @@ Type
   Private
     Fkey,Fvalue : TYAMLData;
   Public
-    constructor create(aKey,aValue : TYAMLData);
-    destructor destroy; override;
+    constructor Create(aKey,aValue : TYAMLData);
+    destructor Destroy; override;
     Property Key : TYAMLData Read FKey;
     Property Value : TYAMLData Read FValue;
   end;
@@ -388,7 +388,7 @@ begin
 end;
 
 
-constructor TYAMLData.create();
+constructor TYAMLData.Create();
 
 begin
   if AllowTag then
@@ -396,7 +396,7 @@ begin
 end;
 
 
-constructor TYAMLData.create(const aAnchor: TYAMLString; const aTag: TYAMLString);
+constructor TYAMLData.Create(const aAnchor: TYAMLString; const aTag: TYAMLString);
 
 begin
   Create;
@@ -419,7 +419,7 @@ end;
 function TYAMLTagData.Clone: TYAMLData;
 
 begin
-  Result:=TYAMLTagData(Self.ClassType).create('',Self.Tag);
+  Result:=TYAMLTagData(Self.ClassType).Create('',Self.Tag);
   TYAMLTagData(Result).Data:=Self.Data;
 end;
 
@@ -716,7 +716,7 @@ var
   I : Integer;
 
 begin
-  Result:=TYAMLDataClass(Self.ClassType).create('',Self.Tag);
+  Result:=TYAMLDataClass(Self.ClassType).Create('',Self.Tag);
   For I:=0 to Count-1 do
     aList.Add(GetItem(I).Clone);
 end;
@@ -796,7 +796,7 @@ begin
   Findex:=-1;
   FList:=aList;
   FKey:=TYAMLScalar.Create('',yttCustom,yskPlain);
-  FItem:=TYAMLMapItem.create(FKey,Nil);
+  FItem:=TYAMLMapItem.Create(FKey,Nil);
 end;
 
 
@@ -1076,7 +1076,7 @@ var
   aMap : TYAMLMapping absolute Result;
 
 begin
-  Result:=TYAMLDataClass(Self.ClassType).create('',Self.tag);
+  Result:=TYAMLDataClass(Self.ClassType).Create('',Self.tag);
   aMap.Kind:=Self.Kind;
   For I:=0 to Count-1 do
     With Mapping[i] do
@@ -1210,7 +1210,7 @@ end;
 
 { TYAMLMapping.TMapItem }
 
-constructor TYAMLMapItem.create(aKey, aValue: TYAMLData);
+constructor TYAMLMapItem.Create(aKey, aValue: TYAMLData);
 
 begin
   FKey:=aKey;

+ 10 - 11
packages/fcl-yaml/src/fpyaml.parser.pp

@@ -49,7 +49,7 @@ Type
     function ConsumeAnchor: TYAMLString;
     function ConsumeVersion: TYAMLVersion;
     class function TokenToScalarKind(aToken: TYAMLToken): TYAMLScalarKind;
-    function GuessTagFromScalarValue(aValue: TYAMLString; aKind: TYAMLScalarKind): TYAMLTagType; virtual;
+    function GuessTagFromScalarValue(const aValue: TYAMLString; aKind: TYAMLScalarKind): TYAMLTagType; virtual;
     Function CreateScanner(aInput : TStream) : TYAMLScanner; virtual;
     function CreateYAMLData(aClass: TYAMLDataClass; aTag : TYAMLTagType = yttCustom): TYAMLData; virtual;
     function CreateDocument : TYAMLDocument;
@@ -71,14 +71,13 @@ Type
     function ParseTagDirective: TYAMLTagData; virtual;
     Property Scanner : TYAMLScanner Read FScanner;
   public
-    Constructor create(aScanner : TYAMLScanner; aOwnsScanner : Boolean = False);
-    Constructor create(aStream: TStream);
-    Constructor create(aInput: TStrings);
-    Constructor create(aInput : array of string);
-    Constructor create(aFileName : string);
-
-    Function Parse : TYAMLStream;
+    Constructor Create(aScanner : TYAMLScanner; aOwnsScanner : Boolean = False);
+    Constructor Create(aStream: TStream);
+    Constructor Create(aInput: TStrings);
+    Constructor Create(const aInput : array of string);
+    Constructor Create(const aFileName : string);
     Destructor Destroy; override;
+    Function Parse : TYAMLStream;
   end;
 
 implementation
@@ -154,7 +153,7 @@ begin
 end;
 
 
-constructor TYAMLParser.create(aInput: array of string);
+constructor TYAMLParser.create(const aInput: array of string);
 
 var
   L : TStrings;
@@ -170,7 +169,7 @@ begin
 end;
 
 
-constructor TYAMLParser.create(aFileName: string);
+constructor TYAMLParser.create(const aFileName: string);
 
 begin
   FStream:=TFileStream.Create(aFileName,fmOpenRead or fmShareDenyWrite);
@@ -178,7 +177,7 @@ begin
 end;
 
 
-function TYAMLParser.GuessTagFromScalarValue(aValue : TYAMLString; aKind : TYAMLScalarKind): TYAMLTagType;
+function TYAMLParser.GuessTagFromScalarValue(const aValue : TYAMLString; aKind : TYAMLScalarKind): TYAMLTagType;
 
 var
   i64 : Int64;

+ 2 - 2
packages/fcl-yaml/src/fpyaml.scanner.pp

@@ -39,7 +39,7 @@ type
   TYAMLPos = record
     Line: Cardinal;
     Column: Cardinal;
-    Constructor create(const aLine, aColumn: Cardinal);
+    Constructor Create(const aLine, aColumn: Cardinal);
   end;
   { TYAMLKey }
 
@@ -239,7 +239,7 @@ const
 
 { TYAMLPos }
 
-constructor TYAMLPos.create(const aLine, aColumn : Cardinal);
+constructor TYAMLPos.Create(const aLine, aColumn : Cardinal);
 
 begin
   Line:=aLine;

+ 4 - 4
packages/fcl-yaml/src/fpyaml.types.pp

@@ -57,9 +57,9 @@ Type
 
   TYAMLTagTypeHelper = Type helper for TYAMLTagType
   private
-    procedure SetAsString(AValue: String);
+    procedure SetAsString(const AValue: String);
   public
-    class function FromString(aString : String) : TYAMLTagType; static;
+    class function FromString(const aString : String) : TYAMLTagType; static;
     function ToString: String;
     Property AsString : String Read ToString Write SetAsString;
   end;
@@ -118,7 +118,7 @@ end;
 
 { TYAMLTagTypeHelper }
 
-procedure TYAMLTagTypeHelper.SetAsString(AValue: String);
+procedure TYAMLTagTypeHelper.SetAsString(const AValue: String);
 var
   T : TYAMLTagType;
 
@@ -132,7 +132,7 @@ begin
       end;
 end;
 
-class function TYAMLTagTypeHelper.FromString(aString: String): TYAMLTagType;
+class function TYAMLTagTypeHelper.FromString(const aString: String): TYAMLTagType;
 begin
   Result:=Default(TYAMLTagType);
   Result.AsString:=aString;