* Fix test compilation, broken after unicode rtl changes..

packages/fcl-base/tests/tccsvdocument.pp

@@ -15,7 +15,7 @@ Type
   private
     FDoc: TCSVDocument;
     procedure RemoveTestFile;
-    function StripQuotes(S: ): ;
+    function StripQuotes(S: String): String;
     procedure TestTestFile;
   Public
     Procedure SetUp; override;
@@ -63,7 +63,7 @@ Const
   RowCount = 4;
 
 Type
-  TRow = Array[0..ColCount-1] of ;
+  TRow = Array[0..ColCount-1] of String;
   TCells = Array[0..RowCount-1] of TRow;
 
 Const
@@ -79,7 +79,7 @@ procedure TTestCSVDocument.CreateTestFile;
 Var
   L : TStringList;
   R,C : Integer;
-  S : ;
+  S : String;
 
 begin
   L:=TStringList.Create;
@@ -106,7 +106,7 @@ begin
   AssertNotNull('Have document',Doc);
 end;
 
-Function TTestCSVDocument.StripQuotes(S : ) : ;
+Function TTestCSVDocument.StripQuotes(S : String) : String;
 
 Var
   L : integer;

packages/fcl-base/tests/tccsvreadwrite.pp

@@ -15,8 +15,8 @@ type
   private
     FData: TStrings;
     FParser: TCSVParser;
-    procedure AssertLine(ARow: Integer; AValues: array of );
-    procedure HaveNext(ARow, ACol: integer; AValue: );
+    procedure AssertLine(ARow: Integer; AValues: array of String);
+    procedure HaveNext(ARow, ACol: integer; AValue: String);
   protected
     procedure SetUp; override;
     procedure TearDown; override;
@@ -39,10 +39,10 @@ begin
   AssertNotNull('Have parser',Parser);
 end;
 
-procedure TTestCSVReadWrite.HaveNext(ARow,ACol: integer; AValue : );
+procedure TTestCSVReadWrite.HaveNext(ARow,ACol: integer; AValue : String);
 
 Var
-  CN : ;
+  CN : String;
 
 begin
   CN:=Format('Cell(row: %d, col: %d)',[ARow,ACol]);
@@ -52,7 +52,7 @@ begin
   AssertEquals(CN+': Value',AValue,Parser.CurrentCellText);
 end;
 
-procedure TTestCSVReadWrite.AssertLine(ARow: Integer; AValues: array of );
+procedure TTestCSVReadWrite.AssertLine(ARow: Integer; AValues: array of String);
 
 Var
   I : Integer;

packages/fcl-base/tests/testexprpars.pp

@@ -29,15 +29,15 @@ type
   TTestExpressionScanner = class(TTestCase)
   Private
     FP : TFPExpressionScanner;
-    FInvalidString : ;
-    procedure DoInvalidNumber(AString: );
-    procedure TestIdentifier(const ASource, ATokenName: );
+    FInvalidString : String;
+    procedure DoInvalidNumber(AString: String);
+    procedure TestIdentifier(const ASource, ATokenName: String);
     procedure TestInvalidNumber;
   protected
     procedure SetUp; override; 
     procedure TearDown; override;
-    Procedure AssertEquals(Msg : ; AExpected, AActual : TTokenType); overload;
-    Procedure TestString(Const AString : ; AToken : TTokenType);
+    Procedure AssertEquals(Msg : String; AExpected, AActual : TTokenType); overload;
+    Procedure TestString(Const AString : String; AToken : TTokenType);
   published
     procedure TestCreate;
     procedure TestSetSource;
@@ -68,16 +68,16 @@ type
   Protected
     FDestroyCalled : Integer;
     FCheckNode : TFPExprNode;
-    procedure AssertNodeType(Msg: ; AClass: TClass; ANode: TFPExprNode); overload;
-    procedure AssertEquals(Msg: ; AResultType : TResultType; ANode: TFPExprNode); overload;
-    procedure AssertEquals(Msg: ; AExpected,AActual : TResultType); overload;
+    procedure AssertNodeType(Msg: String; AClass: TClass; ANode: TFPExprNode); overload;
+    procedure AssertEquals(Msg: String; AResultType : TResultType; ANode: TFPExprNode); overload;
+    procedure AssertEquals(Msg: String; AExpected,AActual : TResultType); overload;
     Function CreateBoolNode(ABoolean: Boolean) : TFPExprNode;
     Function CreateIntNode(AInteger: Integer) : TFPExprNode;
     Function CreateFloatNode(AFloat : TExprFloat) : TFPExprNode;
-    Function CreateStringNode(Astring : ) : TFPExprNode;
+    Function CreateStringNode(Astring : String) : TFPExprNode;
     Function CreateDateTimeNode(ADateTime : TDateTime) : TFPExprNode;
     Procedure AssertNodeOK(FN : TFPExprNode);
-    Procedure AssertNodeNotOK(Const Msg : ; FN : TFPExprNode);
+    Procedure AssertNodeNotOK(Const Msg : String; FN : TFPExprNode);
     Procedure Setup; override;
   end;
 
@@ -272,7 +272,7 @@ type
     Procedure TearDown; override;
     Class Function NodeClass : TFPBooleanResultOperationClass; virtual;
     Class Function ExpectedResult : Boolean; virtual;
-    Class Function OperatorString : ; virtual;
+    Class Function OperatorString : String; virtual;
   Published
     Procedure TestCreateIntegerEqual;
     procedure TestCreateIntegerUnEqual;
@@ -299,7 +299,7 @@ type
   Protected
     Class Function NodeClass : TFPBooleanResultOperationClass; override;
     Class Function ExpectedResult : Boolean; override;
-    Class Function OperatorString : ; override;
+    Class Function OperatorString : String; override;
   end;
 
   { TTestLessThanNode }
@@ -311,7 +311,7 @@ type
     Class Function NodeClass : TFPBooleanResultOperationClass; virtual;
     Class Function Larger : Boolean; virtual;
     Class Function AllowEqual : Boolean; virtual;
-    Class Function OperatorString : ; virtual;
+    Class Function OperatorString : String; virtual;
     Procedure TearDown; override;
   Published
     Procedure TestCreateIntegerEqual;
@@ -343,7 +343,7 @@ type
   protected
     Class Function NodeClass : TFPBooleanResultOperationClass; override;
     Class Function AllowEqual : Boolean; override;
-    Class Function OperatorString : ; override;
+    Class Function OperatorString : String; override;
   end;
 
   { TTestLargerThanNode }
@@ -352,7 +352,7 @@ type
   protected
     Class Function NodeClass : TFPBooleanResultOperationClass; override;
     Class Function Larger : Boolean; override;
-    Class Function OperatorString : ; override;
+    Class Function OperatorString : String; override;
   end;
   { TTestLargerThanEqualNode }
 
@@ -360,7 +360,7 @@ type
   protected
     Class Function NodeClass : TFPBooleanResultOperationClass; override;
     Class Function AllowEqual : Boolean; override;
-    Class Function OperatorString : ; override;
+    Class Function OperatorString : String; override;
   end;
 
   { TTestAddNode }
@@ -423,7 +423,7 @@ type
   Protected
     Procedure Setup; override;
     Procedure TearDown; override;
-    procedure Calc(AExpr: ; Expected: Double = NaN);
+    procedure Calc(AExpr: String; Expected: Double = NaN);
   Published
     Procedure TestCreateInteger;
     Procedure TestCreateFloat;
@@ -498,7 +498,7 @@ type
   TTestExpressionParser = class(TTestBaseParser)
   Private
     FP : TMyFPExpressionParser;
-    FTestExpr : ;
+    FTestExpr : String;
     procedure DoAddInteger(var Result: TFPExpressionResult;
       const Args: TExprParameterArray);
     procedure DoDeleteString(var Result: TFPExpressionResult;
@@ -511,7 +511,7 @@ type
     procedure DoEchoString(var Result: TFPExpressionResult; Const Args: TExprParameterArray);
     procedure DoGetDate(var Result: TFPExpressionResult; Const Args: TExprParameterArray);
     procedure DoParse;
-    procedure TestParser(AExpr: );
+    procedure TestParser(AExpr: String);
   protected
     procedure SetUp; override;
     procedure TearDown; override;
@@ -521,7 +521,7 @@ type
     Procedure AssertResult(F : TExprFloat);
     Procedure AssertCurrencyResult(C : Currency);
     Procedure AssertResult(I : Int64);
-    Procedure AssertResult(S : );
+    Procedure AssertResult(S : String);
     Procedure AssertResult(B : Boolean);
     Procedure AssertDateTimeResult(D : TDateTime);
   end;
@@ -728,11 +728,11 @@ type
   TTestParserVariables = Class(TTestExpressionParser)
   private
     FAsWrongType : TResultType;
-    FEventName: ;
+    FEventName: String;
     FBoolValue : Boolean;
     FTest33 : TFPExprIdentifierDef;
     FIdentifiers : TStrings;
-    procedure AddIdentifier(Sender: TObject; const aIdentifier: ; var aIdent : TFPExprIdentifierDef);
+    procedure AddIdentifier(Sender: TObject; const aIdentifier: String; var aIdent : TFPExprIdentifierDef);
     procedure DoGetBooleanVar(var Res: TFPExpressionResult; ConstRef AName: ShortString);
     procedure DoGetBooleanVarWrong(var Res: TFPExpressionResult; ConstRef AName: ShortString);
     procedure TestAccess(Skip: TResultType);
@@ -911,23 +911,23 @@ type
   private
     FValue : Integer;
     FM : TExprBuiltInManager;
-    FExpr : ;
+    FExpr : String;
     procedure DoAverage(Var Result : TFPExpressionResult; ConstRef AName : ShortString);
     procedure DoSeries(var Result: TFPExpressionResult; ConstRef AName: ShortString);
   Protected
     procedure Setup; override;
     procedure Teardown; override;
-    Procedure SetExpression(Const AExpression : );
-    Procedure AssertVariable(Const ADefinition : ; AResultType : TResultType);
-    Procedure AssertFunction(Const ADefinition,AResultType,ArgumentTypes : ; ACategory : TBuiltinCategory);
-    procedure AssertExpression(Const AExpression : ; AResult : Int64);
-    procedure AssertExpression(Const AExpression : ; Const AResult : );
-    procedure AssertExpression(Const AExpression : ; Const AResult : TExprFloat);
-    procedure AssertExpression(Const AExpression : ; Const AResult : Boolean);
-    procedure AssertDateTimeExpression(Const AExpression : ; Const AResult : TDateTime);
-    procedure AssertAggregateExpression(Const AExpression : ; AResult : Int64; AUpdateCount : integer);
-    procedure AssertAggregateExpression(Const AExpression : ; AResult : TExprFloat; AUpdateCount : integer);
-    procedure AssertAggregateCurrExpression(Const AExpression : ; AResult : Currency; AUpdateCount : integer);
+    Procedure SetExpression(Const AExpression : String);
+    Procedure AssertVariable(Const ADefinition : String; AResultType : TResultType);
+    Procedure AssertFunction(Const ADefinition,AResultType,ArgumentTypes : String; ACategory : TBuiltinCategory);
+    procedure AssertExpression(Const AExpression : String; AResult : Int64);
+    procedure AssertExpression(Const AExpression : String; Const AResult : String);
+    procedure AssertExpression(Const AExpression : String; Const AResult : TExprFloat);
+    procedure AssertExpression(Const AExpression : String; Const AResult : Boolean);
+    procedure AssertDateTimeExpression(Const AExpression : String; Const AResult : TDateTime);
+    procedure AssertAggregateExpression(Const AExpression : String; AResult : Int64; AUpdateCount : integer);
+    procedure AssertAggregateExpression(Const AExpression : String; AResult : TExprFloat; AUpdateCount : integer);
+    procedure AssertAggregateCurrExpression(Const AExpression : String; AResult : Currency; AUpdateCount : integer);
   Published
     procedure TestRegister;
     Procedure TestVariablepi;
@@ -1392,7 +1392,7 @@ end;
 procedure TTestExpressionScanner.TestTokens;
 
 Const
-  TestStrings : Array[TTokenType] of
+  TestStrings : Array[TTokenType] of  String
   (*
   TTokenType = (ttPlus, ttMinus, ttLessThan, ttLargerThan, ttEqual, ttDiv,
                 ttMod, ttMul, ttLeft, ttRight, ttLessThanEqual,
@@ -1421,7 +1421,7 @@ begin
   TestString(FInvalidString,ttNumber);
 end;
 
-procedure TTestExpressionScanner.DoInvalidNumber(AString : );
+procedure TTestExpressionScanner.DoInvalidNumber(AString : String);
 
 begin
   FInvalidString:=AString;
@@ -1466,7 +1466,7 @@ begin
   TestString('''s it''''''',ttString);
 end;
 
-procedure TTestExpressionScanner.TestIdentifier(Const ASource,ATokenName : );
+procedure TTestExpressionScanner.TestIdentifier(Const ASource,ATokenName : String);
 
 begin
   FP.Source:=ASource;
@@ -1497,11 +1497,11 @@ begin
   FreeAndNil(FP);
 end;
 
-procedure TTestExpressionScanner.AssertEquals(Msg: ; AExpected,
+procedure TTestExpressionScanner.AssertEquals(Msg: String; AExpected,
   AActual: TTokenType);
 
 Var
-  S1,S2 : ;
+  S1,S2 : String;
 
 begin
   S1:=TokenName(AExpected);
@@ -1509,7 +1509,7 @@ begin
   AssertEquals(Msg,S1,S2);
 end;
 
-procedure TTestExpressionScanner.TestString(const AString: ;
+procedure TTestExpressionScanner.TestString(const AString: String;
   AToken: TTokenType);
 begin
   FP.Source:=AString;
@@ -1529,21 +1529,21 @@ begin
   FCheckNode.Check;
 end;
 
-procedure TTestBaseParser.AssertNodeType(Msg: ; AClass: TClass;
+procedure TTestBaseParser.AssertNodeType(Msg: String; AClass: TClass;
   ANode: TFPExprNode);
 begin
   AssertNotNull(Msg+': Not null',ANode);
   AssertEquals(Msg+': Class OK',AClass,ANode.ClassType);
 end;
 
-procedure TTestBaseParser.AssertEquals(Msg: ; AResultType: TResultType;
+procedure TTestBaseParser.AssertEquals(Msg: String; AResultType: TResultType;
   ANode: TFPExprNode);
 begin
   AssertNotNull(Msg+': Node not null',ANode);
   AssertEquals(Msg,AResultType,Anode.NodeType);
 end;
 
-procedure TTestBaseParser.AssertEquals(Msg: ; AExpected,
+procedure TTestBaseParser.AssertEquals(Msg: String; AExpected,
   AActual: TResultType);
 
 begin
@@ -1560,7 +1560,7 @@ begin
   Result:=TFPConstExpression.CreateFloat(AFloat);
 end;
 
-function TTestBaseParser.CreateStringNode(Astring: ): TFPExprNode;
+function TTestBaseParser.CreateStringNode(Astring: String): TFPExprNode;
 begin
   Result:=TFPConstExpression.CreateString(AString);
 end;
@@ -1574,7 +1574,7 @@ procedure TTestBaseParser.AssertNodeOK(FN: TFPExprNode);
 
 Var
   B : Boolean;
-  Msg : ;
+  Msg : String;
 
 begin
   AssertNotNull('Node to test OK',FN);
@@ -1590,7 +1590,7 @@ begin
     Fail(Format('Node %s not OK: %s',[FN.ClassName,Msg]));
 end;
 
-procedure TTestBaseParser.AssertNodeNotOK(const MSg : ; FN: TFPExprNode);
+procedure TTestBaseParser.AssertNodeNotOK(const MSg : String; FN: TFPExprNode);
 begin
   FCheckNode:=FN;
   AssertException(Msg,EExprParser,@DoCheck);
@@ -1657,7 +1657,7 @@ procedure TTestConstExprNode.TestCreateDateTime;
 
 Var
   D : TDateTime;
-  S : ;
+  S : String;
 
 begin
   D:=Now;
@@ -1672,7 +1672,7 @@ end;
 procedure TTestConstExprNode.TestCreateString;
 
 Var
-  S : ;
+  S : String;
 
 begin
   S:='Ohlala';
@@ -1705,7 +1705,7 @@ end;
 procedure TTestNegateExprNode.TestCreateFloat;
 
 Var
-  S : ;
+  S : String;
 
 begin
   FN:=TFPNegateOperation.Create(CreateFloatNode(1.23));
@@ -1956,7 +1956,7 @@ begin
   Result:=True
 end;
 
-class function TTestEqualNode.OperatorString: ;
+class function TTestEqualNode.OperatorString: String;
 begin
   Result:='=';
 end;
@@ -2108,7 +2108,7 @@ begin
   Result:=False;
 end;
 
-class function TTestUnEqualNode.OperatorString: ;
+class function TTestUnEqualNode.OperatorString: String;
 begin
   Result:='<>';
 end;
@@ -2130,7 +2130,7 @@ begin
   Result:=False;
 end;
 
-class function TTestLessThanNode.OperatorString: ;
+class function TTestLessThanNode.OperatorString: String;
 begin
   Result:='<';
 end;
@@ -2318,7 +2318,7 @@ begin
   Result:=True;
 end;
 
-class function TTestLessThanEqualNode.OperatorString: ;
+class function TTestLessThanEqualNode.OperatorString: String;
 begin
   Result:='<=';
 end;
@@ -2335,7 +2335,7 @@ begin
   Result:=True;
 end;
 
-class function TTestLargerThanNode.OperatorString: ;
+class function TTestLargerThanNode.OperatorString: String;
 begin
   Result:='>';
 end;
@@ -2352,7 +2352,7 @@ begin
   Result:=True;
 end;
 
-class function TTestLargerThanEqualNode.OperatorString: ;
+class function TTestLargerThanEqualNode.OperatorString: String;
 begin
   Result:='>=';
 end;
@@ -2553,7 +2553,7 @@ begin
   FE.Builtins := [bcMath];
 end;
 
-procedure TTestPowerNode.Calc(AExpr: ; Expected: Double =NaN);
+procedure TTestPowerNode.Calc(AExpr: String; Expected: Double =NaN);
 const
   EPS = 1e-9;
 var
@@ -2825,7 +2825,7 @@ end;
 procedure TTestFloatToDateTimeNode.TestAsString;
 
 Var
-  S : ;
+  S : String;
 
 begin
   FN:=TFloatToDateTimeNode.Create(CreateFloatNode(1.2));
@@ -2860,7 +2860,7 @@ begin
   FP.Expression:=FTestExpr;
 end;
 
-procedure TTestExpressionParser.TestParser(AExpr : );
+procedure TTestExpressionParser.TestParser(AExpr : String);
 
 begin
   FTestExpr:=AExpr;
@@ -2913,7 +2913,7 @@ begin
   AssertEquals('Correct integer result',I,FP.Evaluate.ResInteger);
 end;
 
-procedure TTestExpressionParser.AssertResult(S: );
+procedure TTestExpressionParser.AssertResult(S: String);
 begin
   AssertEquals('Correct  result',S,FP.ExprNode.NodeValue.ResString);
   AssertEquals('Correct string result',S,FP.Evaluate.ResString);
@@ -2940,7 +2940,7 @@ end;
 
 procedure TTestParserExpressions.TestNumberValues;
 
-  Procedure DoTest(E :  ; V : integer);
+  Procedure DoTest(E : String; V : integer);
 
   var
     res: TFPExpressionResult;
@@ -5016,7 +5016,7 @@ begin
   Res.ResBoolean:=FBoolValue;
 end;
 
-procedure TTestParserVariables.AddIdentifier(Sender: TObject; const aIdentifier: ; var aIdent : TFPExprIdentifierDef);
+procedure TTestParserVariables.AddIdentifier(Sender: TObject; const aIdentifier: String; var aIdent : TFPExprIdentifierDef);
 begin
   aIdent:=Nil;
   AssertNotNull('Have identifier list',FIdentifiers);
@@ -5044,7 +5044,7 @@ begin
 end;
 
 Var
-  FVarCallBackName:;
+  FVarCallBackName: string;
   FVarBoolValue : Boolean;
 
 procedure DoGetBooleanVar2(var Res: TFPExpressionResult; ConstRef AName: ShortString);
@@ -6097,10 +6097,10 @@ begin
   inherited Teardown;
 end;
 
-procedure TTestBuiltins.SetExpression(const AExpression: );
+procedure TTestBuiltins.SetExpression(const AExpression: String);
 
 Var
-  Msg : ;
+  Msg : String;
 
 begin
   Msg:='';
@@ -6114,7 +6114,7 @@ begin
     Fail('Parsing of expression "'+AExpression+'" failed :'+Msg);
 end;
 
-procedure TTestBuiltins.AssertVariable(const ADefinition: ;
+procedure TTestBuiltins.AssertVariable(const ADefinition: String;
   AResultType: TResultType);
 
 Var
@@ -6127,7 +6127,7 @@ begin
 end;
 
 procedure TTestBuiltins.AssertFunction(const ADefinition, AResultType,
-  ArgumentTypes: ; ACategory : TBuiltinCategory);
+  ArgumentTypes: String; ACategory : TBuiltinCategory);
 
 Var
   I : TFPBuiltinExprIdentifierDef;
@@ -6141,7 +6141,7 @@ begin
   AssertEquals(ADefinition+' has correct category',Ord(ACategory),Ord(I.Category));
 end;
 
-procedure TTestBuiltins.AssertExpression(const AExpression: ;
+procedure TTestBuiltins.AssertExpression(const AExpression: String;
   AResult: Int64);
 
 begin
@@ -6150,15 +6150,15 @@ begin
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertExpression(const AExpression: ;
-  const AResult: );
+procedure TTestBuiltins.AssertExpression(const AExpression: String;
+  const AResult: String);
 begin
   FP.BuiltIns:=AllBuiltIns;
   SetExpression(AExpression);
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertExpression(const AExpression: ;
+procedure TTestBuiltins.AssertExpression(const AExpression: String;
   const AResult: TExprFloat);
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6166,7 +6166,7 @@ begin
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertExpression(const AExpression: ;
+procedure TTestBuiltins.AssertExpression(const AExpression: String;
   const AResult: Boolean);
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6174,7 +6174,7 @@ begin
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertDateTimeExpression(const AExpression: ;
+procedure TTestBuiltins.AssertDateTimeExpression(const AExpression: String;
   const AResult: TDateTime);
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6182,7 +6182,7 @@ begin
   AssertDatetimeResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertAggregateExpression(const AExpression: ;
+procedure TTestBuiltins.AssertAggregateExpression(const AExpression: String;
   AResult: Int64; AUpdateCount: integer);
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6197,7 +6197,7 @@ begin
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertAggregateExpression(const AExpression: ;
+procedure TTestBuiltins.AssertAggregateExpression(const AExpression: String;
   AResult: TExprFloat; AUpdateCount: integer);
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6212,7 +6212,7 @@ begin
   AssertResult(AResult);
 end;
 
-procedure TTestBuiltins.AssertAggregateCurrExpression(Const AExpression : ; AResult : Currency; AUpdateCount : integer);
+procedure TTestBuiltins.AssertAggregateCurrExpression(Const AExpression : String; AResult : Currency; AUpdateCount : integer);
 
 begin
   FP.BuiltIns:=AllBuiltIns;
@@ -6647,7 +6647,7 @@ end;
 procedure TTestBuiltins.TestFunctionstrtofloat;
 
 Var
-  S : ;
+  S : String;
 
 begin
   S:='1.23';
@@ -6731,7 +6731,7 @@ procedure TTestBuiltins.TestFunctionstrtodatetime;
 
 Var
   T : TDateTime;
-  S : ;
+  S : String;
 
 begin
   T:=Now;
@@ -6743,7 +6743,7 @@ procedure TTestBuiltins.TestFunctionstrtodatetimedef;
 
 Var
   T : TDateTime;
-  S : ;
+  S : String;
 
 begin
   T:=Now;