rtl: fixed AnsiCompareStr

This commit is contained in:
mattias 2019-02-15 22:41:33 +00:00
parent 6731fdacd0
commit eff31f67be

View File

@ -33,9 +33,9 @@ Const
type type
{ TFloatRec } { TFloatRec }
TFloatRec = Record TFloatRec = Record
Exponent: Integer; Exponent: Integer;
Negative: Boolean; Negative: Boolean;
Digits: Array[0..FloatRecDigits-1] Of Char; Digits: Array[0..FloatRecDigits-1] of Char;
End; End;
TEndian = (Little,Big); TEndian = (Little,Big);
TFileName = String; TFileName = String;
@ -167,7 +167,6 @@ type
ENoConstructException = class(Exception); ENoConstructException = class(Exception);
//function GetTickCount: Integer; //function GetTickCount: Integer;
@ -176,10 +175,10 @@ type
*****************************************************************************} *****************************************************************************}
Const Const
EmptyStr = ''; EmptyStr = '';
EmptyWideStr = ''; // No difference here. EmptyWideStr = ''; // No difference here.
HexDisplayPrefix: string = '$'; HexDisplayPrefix: string = '$';
LeadBytes = [] unimplemented; LeadBytes = [] unimplemented;
Function CharInSet(Ch: Char;Const CSet : array of char) : Boolean; Function CharInSet(Ch: Char;Const CSet : array of char) : Boolean;
@ -1413,7 +1412,7 @@ end;
function AnsiCompareStr(const s1, s2: String): Integer; function AnsiCompareStr(const s1, s2: String): Integer;
begin begin
{$IFDEF ECMAScript6} {$IFDEF ECMAScript6}
Result:=CompareText(TJSString(s1).normalize(),TJSString(s1).normalize()); Result:=CompareText(TJSString(s1).normalize(),TJSString(s2).normalize());
{$ELSE} {$ELSE}
Result:=CompareText(s1,s2); Result:=CompareText(s1,s2);
{$ENDIF} {$ENDIF}
@ -1432,8 +1431,6 @@ Const
feInvalidArgIndex = 3; feInvalidArgIndex = 3;
Procedure DoFormatError (ErrCode : Longint;const fmt: String); Procedure DoFormatError (ErrCode : Longint;const fmt: String);
begin begin
//!! must be changed to contain format string... //!! must be changed to contain format string...
Case ErrCode of Case ErrCode of