* Fix warnings & hints, use resourcestrings, add const where appropriate

packages/fcl-js/src/jsparser.pp

@@ -75,11 +75,11 @@ Type
     procedure ClassDefToMembers(aClass: TJSClassDeclaration; aClassDef: TJSObjectTypeDef);
     function CurrentTokenIsValidIdentifier: Boolean;
     function GetIsTypeScript: Boolean;
-    function  IdentifierIsLiteral(aValue : String) : Boolean;
-    Procedure CheckIdentifierLiteral(aValue : String);
-    function ConsumeIdentifierLiteral(aValue: String): TJSToken;
+    function  IdentifierIsLiteral(const aValue : jsbase.TJSString) : Boolean;
+    Procedure CheckIdentifierLiteral(const aValue : jsbase.TJSString);
+    function ConsumeIdentifierLiteral(const aValue: jsbase.TJSString): TJSToken;
     function CheckSemiColonInsert(aToken: TJSToken; Consume: Boolean): Boolean;
-    function EnterLabel(ALabelName: String): TJSLabel;
+    function EnterLabel(const ALabelName: jsBase.TJSString): TJSLabel;
     // Check that current token is aToken
     procedure Expect(aToken: TJSToken);
     // Check that current token is aToken and goto next token.
@@ -87,14 +87,14 @@ Type
     procedure FreeCurrentLabelSet;
     function GetVersion: TECMAVersion;
     procedure LeaveLabel;
-    function LookupLabel(ALabelName: String; Kind: TJSToken): TJSLabel;
+    function LookupLabel(const ALabelName: jsBase.TJSString; Kind: TJSToken): TJSLabel;
     function ParseAdditiveExpression: TJSElement;
     procedure ParseAliasElements(aElements: TJSAliasElements);
     procedure ParseAmbientClassBody(aObj: TJSObjectTypeDef);
     function ParseArguments: TJSarguments;
     function ParseArrayLiteral: TJSElement;
     procedure ParseArrowFunctionTypeDef(aDef: TJSArrowFunctionTypeDef; aFirstParam: TJSTypedParam); overload;
-    function ParseArrowFunctionTypeDef(aArgName: jsBase.TJSString; aArgIsSpread: Boolean): TJSArrowFunctionTypeDef; overload;
+    function ParseArrowFunctionTypeDef(const  aArgName: jsBase.TJSString; aArgIsSpread: Boolean): TJSArrowFunctionTypeDef; overload;
     function ParseArrowFunctionTypeDef(aFirst: TJSObjectTypeDef; aArgIsSpread: Boolean): TJSArrowFunctionTypeDef;  overload;
     function ParseAssignmentExpression: TJSElement;
     function ParseBitwiseAndExpression: TJSElement;
@@ -187,16 +187,16 @@ Type
     Function CreateElement(AElementClass : TJSElementClass)  : TJSElement; virtual;
     Procedure FreeElement(aElement : TJSElement); virtual;
     Procedure FreeElement(aElements : TJSElementNodes); virtual;
-    Procedure Error(Msg : String);
-    Procedure Error(Fmt : String; Args : Array of const);
+    Procedure Error(const Msg : String);
+    Procedure Error(const Fmt : String; Args : Array of const);
     // Parse functions
-    Function IsIdentifier(const aIdentifier : String) : Boolean; inline;
+    Function IsIdentifier(const aIdentifier : jsBase.TJSString) : Boolean; inline;
     function ParseSourceElements(ScopeType : TScopeType = stFunction; ParentisAmbient : Boolean = False): TJSSourceElements;
     Property FunctionDepth : Integer Read FFunctionDepth Write FFunctionDepth;
     Property NoIn : Boolean Read FNoIn Write FNoIn;
     Property IsLHS : Boolean Read FIsLHS Write FIsLHS;
   Public
-    Constructor Create(AInput: TStream; aVersion : TECMAVersion = ecma5; aIsTypeScript : Boolean = false; aFileName : String = '');
+    Constructor Create(AInput: TStream; aVersion : TECMAVersion = ecma5; aIsTypeScript : Boolean = false; const aFileName : String = '');
     // Scanner has version
     Constructor Create(AScanner : TJSScanner);
     Destructor Destroy; override;
@@ -353,7 +353,7 @@ begin
   L.Free; // ??
 end;
 
-function TJSParser.LookupLabel(ALabelName : String; Kind : TJSToken) :TJSLabel;
+function TJSParser.LookupLabel(const ALabelName: jsBase.TJSString; Kind: TJSToken): TJSLabel;
 
 Var
   L : TJSLabel;
@@ -382,7 +382,7 @@ begin
     end;
 end;
 
-function TJSParser.EnterLabel(ALabelName : String) :TJSLabel;
+function TJSParser.EnterLabel(const ALabelName: jsBase.TJSString): TJSLabel;
 
 Var
   L : TJSLabel;
@@ -451,7 +451,7 @@ begin
   aElements.Free;
 end;
 
-Procedure TJSParser.Error(Msg: String);
+Procedure TJSParser.Error(const Msg: String);
 
 Var
   ErrAt : String;
@@ -470,17 +470,17 @@ begin
   Raise E;
 end;
 
-Procedure TJSParser.Error(Fmt: String; Args: Array of const);
+Procedure TJSParser.Error(const Fmt: String; Args: Array of const);
 begin
   Error(Format(Fmt,Args));
 end;
 
-function TJSParser.IsIdentifier(const aIdentifier: String): Boolean;
+function TJSParser.IsIdentifier(const aIdentifier: jsBase.TJSString): Boolean;
 begin
   Result:=IdentifierIsLiteral(aIdentifier);
 end;
 
-constructor TJSParser.Create(AInput: TStream; aVersion: TECMAVersion; aIsTypeScript: Boolean; aFileName : String = '');
+constructor TJSParser.Create(AInput: TStream; aVersion: TECMAVersion; aIsTypeScript: Boolean; const aFileName : String = '');
 begin
   FInput:=AInput;
   FCurrent:=TJSUnknown;
@@ -514,23 +514,24 @@ begin
       Error(SerrTokenMismatch,[CurrenttokenString,TokenInfos[aToken]]);
 end;
 
-function TJSParser.IdentifierIsLiteral(aValue: String): Boolean;
+function TJSParser.IdentifierIsLiteral(const aValue: jsbase.TJSString): Boolean;
 begin
   Result:=(CurrentToken=tjsIdentifier) and (CurrentTokenString=aValue);
 end;
 
+
 function TJSParser.GetIsTypeScript: Boolean;
 begin
   Result:=FScanner.IsTypeScript;
 end;
 
-procedure TJSParser.CheckIdentifierLiteral(aValue: String);
+procedure TJSParser.CheckIdentifierLiteral(const aValue: jsbase.TJSString);
 begin
   if Not IdentifierIsLiteral(aValue) then
     Error(SErrExpectedButFound,[aValue,CurrentTokenString]);
 end;
 
-Function TJSParser.ConsumeIdentifierLiteral(aValue: String) : TJSToken;
+function TJSParser.ConsumeIdentifierLiteral(const aValue: jsbase.TJSString): TJSToken;
 begin
   CheckidentifierLiteral(aValue);
   Result:=GetNextToken;
@@ -897,7 +898,7 @@ begin
     end;
 end;
 
-Function TJSParser.ParseArrowFunctionTypeDef (aArgName : jsBase.TJSString; aArgIsSpread : Boolean) : TJSArrowFunctionTypeDef;
+function TJSParser.ParseArrowFunctionTypeDef(const aArgName: jsBase.TJSString; aArgIsSpread: Boolean): TJSArrowFunctionTypeDef;
 
 var
   P : TJSTypedParam;
@@ -1092,7 +1093,7 @@ function TJSParser.ParseTypeSimple(aOptions : TParseTypeOptions): TJSTypeDef;
 Var
   CurrT : TJSToken;
   isInferred,IsReadOnly,IsTypeOf,IsKeyOf : Boolean;
-  aName : String;
+  aName : jsBase.TJSString;
 
 begin
   Result:=Nil;
@@ -1683,7 +1684,7 @@ begin
   try
     if Pos('0x',CurrentTokenString) = 1 then
       begin
-      D:=StrToInt('$'+Copy(CurrentTokenString,3,Length(CurrentTokenString)-2));
+      D:=StrToInt('$'+UTF8Encode(Copy(CurrentTokenString,3,Length(CurrentTokenString)-2)));
       I:=0;
       end
     else
@@ -1721,7 +1722,7 @@ end;
 function TJSParser.ParseRegularExpressionLiteral: TJSElement;
 
 Var
-  S,pa,fl : String;
+  S,pa,fl : jsBase.TJSString;
   P : integer;
   R : TJSRegularExpressionLiteral;
 begin
@@ -2728,7 +2729,7 @@ end;
 Procedure TJSParser.ParseAliasElements(aElements : TJSAliasElements);
 // Parse { N [as M] }. On entry, must be on {, on exit curtoken is token after }
 Var
-  aName,aAlias : String;
+  aName,aAlias : jsbase.TJSString;
 begin
   Consume(tjsCurlyBraceOpen);
   if (CurrentToken<>tjsCurlyBraceClose) then
@@ -3974,7 +3975,7 @@ Procedure TJSParser.ParseAmbientClassBody(aObj: TJSObjectTypeDef);
     Result.Name:='any';
   end;
   
-  Function CheckSpecial(aName : string) : Boolean;
+  Function CheckSpecial(aName : jsBase.TJSstring) : Boolean;
   
   begin
     Result:=IsIdentifier(aName) and Not (PeekNextToken in [tjsConditional,tjsColon]);

packages/fcl-js/src/jsscanner.pp

@@ -36,7 +36,7 @@ Const
 
 resourcestring
   SErrInvalidCharacter = 'Invalid character ''%s''';
-  SErrOpenString = 'string exceeds end of line';
+  SErrUnTerminatedString = 'string exceeds end of line';
   SErrExpectedEllipsis = 'Expected ellipsis, got ..';
   SErrIncludeFileNotFound = 'Could not find include file ''%s''';
   SErrIfXXXNestingLimitReached = 'Nesting of $IFxxx too deep';
@@ -100,7 +100,7 @@ Type
     FSourceFilename: string;
     FCurRow: Integer;
     FCurToken: TJSToken;
-    FCurTokenString: String;
+    FCurTokenString: UTF8String;
     FCurLine: string;
     FWasMultilineString: Boolean;
     TokenStr: PChar;
@@ -141,7 +141,7 @@ Type
     property CurRow: Integer read FCurRow;
     property CurColumn: Integer read GetCurColumn;
     property CurToken: TJSToken read FCurToken;
-    property CurTokenString: String read FCurTokenString;
+    property CurTokenString: UTF8String read FCurTokenString;
     property ECMAVersion : TECMAVersion Read FECMAVersion Write SetECMAVersion;
     Property IsTypeScript : Boolean Read FIsTypeScript Write SetIsTypeScript;
     Property DisableRShift : Boolean Read FDisableRShift Write FDisableRShift;
@@ -426,7 +426,7 @@ Var
   Delim : Char;
   TokenStart : PChar;
   Len,OLen: Integer;
-  S : String;
+  S : UTF8String;
 
   Procedure AddToString;
 
@@ -463,9 +463,9 @@ begin
         '\' : S:='\';
         '/' : S:='/';
         'u' : begin
-              S:=ReadUniCodeEscape;
+              S:=UTF8Encode(ReadUniCodeEscape);
               end;
-        #0  : Error(SErrOpenString);
+        #0  : Error(SErrUnterminatedString);
       else
         Error(SErrInvalidCharacter, [TokenStr[0]]);
       end;
@@ -482,20 +482,20 @@ begin
     if TokenStr[0] = #0 then
       begin
       if Delim<>'`' then
-        Error(SErrOpenString)
+        Error(SErrUnterminatedString)
       else
         begin
         AddToString;
         FCurTokenString:=FCurTokenString+FSourceFile.LastLF;
         oLen:=oLen+Length(FSourceFile.LastLF);
         if Not FetchLine then
-          Error(SErrOpenString);
+          Error(SErrUnterminatedString);
         TokenStart:=TokenStr;
         end
       end;
     end;
   if TokenStr[0] = #0 then
-    Error(SErrOpenString);
+    Error(SErrUnterminatedString);
   AddToString;
   Inc(TokenStr);
   Result := tjsString;

packages/fcl-js/src/jstoken.pp

@@ -58,7 +58,7 @@ const
   FirstKeyword = tjsAwait;
   LastKeyWord = tJSYield;
 
-  TokenInfos: array[TJSToken] of string = ('unknown',
+  TokenInfos: array[TJSToken] of String = ('unknown',
        // Specials
         'EOF','whitespace','Char','String', 'identifier','number','comment','regular expression', 'reserved word',
         '&&','&=',

packages/fcl-js/src/jstree.pp

@@ -1319,9 +1319,9 @@ Type
 
   TJSImportTypeRef = Class(TJSTypeReference)
   private
-    FFileName: String;
+    FFileName: TJSString;
   Public
-    Property FileName : String Read FFileName Write FFileName;
+    Property FileName : TJSString Read FFileName Write FFileName;
   end;
 
 

packages/fcl-js/tests/tcparser.pp

@@ -386,7 +386,7 @@ Var
 begin
   E:=GetVars;
   AssertNotNull('Have statements',E);
-  Writeln('Count : ',E.Count);
+  // Writeln('Count : ',E.Count);
   If (E.Count=0) then
     Fail('Zero variables defined');
   Result:=E.Nodes[0].Node;
@@ -2171,7 +2171,6 @@ Var
   E : TJSSourceElements;
   N : TJSElement;
   FD : TJSFunctionDeclarationStatement;
-  P : TJSTypedParam;
 
 begin
   CreateParser('function a (...b,c) {}');

packages/fcl-js/tests/tctsparser.pp

@@ -5,7 +5,7 @@ unit tctsparser;
 interface
 
 uses
-  Classes, SysUtils, testregistry, tcparser, jsscanner, jsbase, jstree, jstoken, jsparser;
+  Classes, SysUtils, testregistry, tcparser, jsscanner, jsbase, jstree, jstoken;
 
 Type
 
@@ -357,10 +357,10 @@ begin
   AssertEquals('Correct number of elements',2,U.TypeCount);
   AssertEquals('Correct type of element 0',TJSFixedValueReference, U.Types[0].ClassType);
   R:=U.Types[0] as TJSFixedValueReference;
-//  AssertEquals('Name type 0','string',R.Name);
+  AssertEquals('Name type 0','string',R.FixedValue.Value.AsString);
   AssertEquals('Correct type of element 0',TJSFixedValueReference, U.Types[1].ClassType);
   R:=U.Types[1] as TJSFixedValueReference;
-//  AssertEquals('Name type 1','number',R.Name);
+  AssertEquals('Name type 1','number',R.FixedValue.Value.AsString);
 end;
 
 procedure TTestTypeScriptParser.TestDeclareTypeUnionAllowEmpty;
@@ -389,7 +389,6 @@ end;
 procedure TTestTypeScriptParser.TestDeclareUnionTuple;
 Var
   T : TJSTypeDeclaration;
-  U : TJSUnionTypeDef;
 begin
   StartTS('declare type Color = string | [number, number, number, number] | ColorObject;');
   T:=GetFirstType;
@@ -400,7 +399,6 @@ procedure TTestTypeScriptParser.TestDeclareUnionIntersectionType;
 Var
   T : TJSTypeDeclaration;
   U : TJSUnionTypeDef;
-  R : TJSTypeReference;
 
 begin
   StartTs('declare type MyType = number | (string | number) ;');
@@ -645,8 +643,6 @@ procedure TTestTypeScriptParser.TestDeclareTypeGenericNestedTwice;
 
 Var
   T : TJSTypeDeclaration;
-  G : TJSGenericTypeRef;
-  R : TJSTypeReference;
 
 begin
   StartTS('type a = A<Q<B<C<D>>>>;');
@@ -1251,7 +1247,6 @@ procedure TTestTypeScriptParser.TestDeclareInterfaceExtendsGeneric;
 Var
   Decl : TJSInterfaceDeclaration;
   R : TJSTypeReference;
-  Lit : TJSLiteral;
 
 begin
   StartTS('interface Empty <TItem> extends ParentEmpty<Titem> {};');
@@ -1852,7 +1847,6 @@ end;
 procedure TTestTypeScriptParser.TestExportTypeArrowFunctionArgsComma;
 Var
   S : TJSExportStatement;
-  T:TJSTypeDeclaration;
 
 begin
   StartTS('export type ConnectionRequestCb = ('#10+
@@ -1861,7 +1855,7 @@ begin
           '      reject: ConnectionRequestRejectFn,'#10+
           '  ) => void;');
   S:=TJSExportStatement(CheckClass('First statement',TJSExportStatement,GetFirstStatement));
-  T:=TJSTypeDeclaration(CheckClass('Decl',TJSTypeDeclaration,S.Declaration));
+  CheckClass('Decl',TJSTypeDeclaration,S.Declaration);
 end;
 
 procedure TTestTypeScriptParser.TestExportEnum;