diff --git a/src/shared/utils.pas b/src/shared/utils.pas
index 308293da64e3aed41b94449e6f71a2b3d69727ac..59a49f251dbb3b927cfea195b442f38ab3656ae8 100644 (file)
--- a/src/shared/utils.pas
+++ b/src/shared/utils.pas
function addWadExtension (const fn: AnsiString): AnsiString;
// convert number to strig with nice commas
function addWadExtension (const fn: AnsiString): AnsiString;
// convert number to strig with nice commas
-function Int64ToStrComma (i: Int64): AnsiString;
+function int64ToStrComma (i: Int64): AnsiString;
-function UpCase1251 (ch: Char): Char;
-function LoCase1251 (ch: Char): Char;
+function upcase1251 (ch: AnsiChar): AnsiChar; inline;
+function locase1251 (ch: AnsiChar): AnsiChar; inline;
function toLowerCase1251 (const s: AnsiString): AnsiString;
// `true` if strings are equal; ignoring case for cp1251
function toLowerCase1251 (const s: AnsiString): AnsiString;
// `true` if strings are equal; ignoring case for cp1251
-function StrEquCI1251 (const s0, s1: AnsiString): Boolean;
+function strEquCI1251 (const s0, s1: AnsiString): Boolean;
function utf8Valid (const s: AnsiString): Boolean;
function utf8Valid (const s: AnsiString): Boolean;
if (code < 0) or (code > $10FFFF) then begin result := '?'; exit; end;
if (code <= $7f) then
begin
if (code < 0) or (code > $10FFFF) then begin result := '?'; exit; end;
if (code <= $7f) then
begin
- result := Char(code and $ff);
+ result := AnsiChar(code and $ff);
end
else if (code <= $7FF) then
begin
end
else if (code <= $7FF) then
begin
- result := Char($C0 or (code shr 6));
- result += Char($80 or (code and $3F));
+ result := AnsiChar($C0 or (code shr 6));
+ result += AnsiChar($80 or (code and $3F));
end
else if (code <= $FFFF) then
begin
end
else if (code <= $FFFF) then
begin
- result := Char($E0 or (code shr 12));
- result += Char($80 or ((code shr 6) and $3F));
- result += Char($80 or (code and $3F));
+ result := AnsiChar($E0 or (code shr 12));
+ result += AnsiChar($80 or ((code shr 6) and $3F));
+ result += AnsiChar($80 or (code and $3F));
end
else if (code <= $10FFFF) then
begin
end
else if (code <= $10FFFF) then
begin
- result := Char($F0 or (code shr 18));
- result += Char($80 or ((code shr 12) and $3F));
- result += Char($80 or ((code shr 6) and $3F));
- result += Char($80 or (code and $3F));
+ result := AnsiChar($F0 or (code shr 18));
+ result += AnsiChar($80 or ((code shr 12) and $3F));
+ result += AnsiChar($80 or ((code shr 6) and $3F));
+ result += AnsiChar($80 or (code and $3F));
end
else
begin
end
else
begin
end;
end;
-function Int64ToStrComma (i: Int64): AnsiString;
+function int64ToStrComma (i: Int64): AnsiString;
var
f: Integer;
begin
var
f: Integer;
begin
end;
end;
-function UpCase1251 (ch: Char): Char;
+function upcase1251 (ch: AnsiChar): AnsiChar; inline;
begin
if ch < #128 then
begin
begin
if ch < #128 then
begin
end;
end;
-function LoCase1251 (ch: Char): Char;
+function locase1251 (ch: AnsiChar): AnsiChar; inline;
begin
if ch < #128 then
begin
begin
if ch < #128 then
begin
end;
end;
-function StrEquCI1251 (const s0, s1: AnsiString): Boolean;
+function strEquCI1251 (const s0, s1: AnsiString): Boolean;
var
i: Integer;
begin
var
i: Integer;
begin
);
);
-function decodeUtf8Char (s: AnsiString; var pos: Integer): char;
+function decodeUtf8Char (s: AnsiString; var pos: Integer): AnsiChar;
var
b, c: Integer;
begin
var
b, c: Integer;
begin
b := Byte(s[pos]);
Inc(pos);
b := Byte(s[pos]);
Inc(pos);
- if b < $80 then begin result := char(b); exit; end;
+ if b < $80 then begin result := AnsiChar(b); exit; end;
// mask out unused bits
if (b and $FE) = $FC then b := b and $01
// mask out unused bits
if (b and $FE) = $FC then b := b and $01
end;
// done, try 1251
end;
// done, try 1251
- for c := 128 to 255 do if uni2wint[c] = b then begin result := char(c and $FF); exit; end;
+ for c := 128 to 255 do if uni2wint[c] = b then begin result := AnsiChar(c and $FF); exit; end;
// alas
end;
// alas
end;
function checkSign (st: TStream; const sign: AnsiString): Boolean;
var
function checkSign (st: TStream; const sign: AnsiString): Boolean;
var
- buf: packed array[0..7] of Char;
+ buf: packed array[0..7] of AnsiChar;
f: Integer;
begin
result := false;
f: Integer;
begin
result := false;