paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-13 23:19:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazUtils: Move funcs QuickUtf8UpperCase and QuickUtf8LowerCase from FpDbgUtil to LazUTF8 and name them differently. Part of issue .

Browse Source
This commit is contained in:
Juha 2024-06-29 11:51:57 +03:00
parent 8c83fc1d9e
commit 134275eeec
3 changed files with 60 additions and 63 deletions

14
components/fpdebug/fpdbgdwarfdataclasses.pas
View File

@ -931,8 +931,8 @@ end;
function NameInfoForSearch(const AName: String): TNameSearchInfo;
begin
Result.NameLower := QuickUtf8LowerCase(AName);
Result.NameUpper := QuickUtf8UpperCase(AName);
Result.NameLower := UTF8LowerCaseFast(AName);
Result.NameUpper := UTF8UpperCaseFast(AName);
Result.NameHash := objpas.Hash(Result.NameUpper) and $7fff or $8000;
end;
@ -2866,7 +2866,7 @@ begin
if not HasValidScope then
exit;
h := objpas.Hash(QuickUtf8UpperCase(CompUnit.UnitName)) and $7fff or $8000;
h := objpas.Hash(UTF8UpperCaseFast(CompUnit.UnitName)) and $7fff or $8000;
AKNownHashes^[h and KnownNameHashesBitMask] := True;
NextTopLevel := 0;
@ -2889,7 +2889,7 @@ begin
NextTopLevel := FScope.GetNextIndex;
Continue;
end;
h := objpas.Hash(QuickUtf8UpperCase(EntryName)) and $7fff or $8000;
h := objpas.Hash(UTF8UpperCaseFast(EntryName)) and $7fff or $8000;
FScope.Current^.NameHash := h;
if (FScope.Index >= NextTopLevel) or InEnum then
AKNownHashes^[h and KnownNameHashesBitMask] := True;
@ -2932,8 +2932,8 @@ begin
GoChild;
if not HasValidScope then
exit;
s1 := QuickUtf8UpperCase(AName);
s2 := UTF8LowerCase(AName);
s1 := UTF8UpperCaseFast(AName);
s2 := UTF8LowerCase(AName); // Should this be UTF8LowerCaseFast(AName) ?
while HasValidScope do begin
PrepareAbbrev;
if (FAbbrev = nil) or not (dafHasName in FAbbrev^.flags) then begin
@ -2945,7 +2945,7 @@ begin
Continue;
end;
if CompareUtf8BothCase(@s1[1], @s2[1], EntryName) then begin
if CompareUtf8BothCase(@s1[1], @s2[1], EntryName) then begin
// TODO: check DW_AT_start_scope;
DebugLn(FPDBG_DWARF_SEARCH, ['GoNamedChild found ', dbgs(FScope, FCompUnit), ' Result=', DbgSName(Self), ' FOR ', AName]);
Result := True;

56
components/fpdebug/fpdbgutil.pp
View File

@ -201,10 +201,6 @@ var
function CompareUtf8BothCase(AnUpper, AnLower, AnUnknown: PChar): Boolean;
// Optimistic upper/lower case. Attempt Ansi only, but if none ansi is found, do utf8
function QuickUtf8UpperCase(const AText: String): String;
function QuickUtf8LowerCase(const AText: String): String;
function AlignPtr(Src: Pointer; Alignment: Byte): Pointer;
function ValueFromMem(const AValue; ASize: Byte; AFlags: THexValueFormatFlags): Int64;
function HexValue(const AValue; ASize: Byte; AFlags: THexValueFormatFlags): String;
@ -375,58 +371,6 @@ begin
Result := AnUpper^ = AnUnknown^; // both #0
end;
function QuickUtf8UpperCase(const AText: String): String;
var
src, dst: PChar;
c: Integer;
t: Char;
begin
SetLength(Result, Length(AText));
if Result = '' then
exit;
src := @AText[1];
dst := @Result[1];
c := Length(Result);
while c > 0 do begin
t := src^;
if (ord(t) and 128) <> 0 then
exit(UTF8UpperCase(AText));
if (t in ['a'..'z']) then
t := chr(ord(t) - 32);
dst^ := t;
dec(c);
inc(src);
inc(dst);
end;
end;
function QuickUtf8LowerCase(const AText: String): String;
var
src, dst: PChar;
c: Integer;
t: Char;
begin
SetLength(Result, Length(AText));
if Result = '' then
exit;
src := @AText[1];
dst := @Result[1];
c := Length(Result);
while c > 0 do begin
t := src^;
if (ord(t) and 128) <> 0 then
exit(UTF8UpperCase(AText));
if (t in ['A'..'Z']) then
t := chr(ord(t) + 32);
dst^ := t;
dec(c);
inc(src);
inc(dst);
end;
end;
function AlignPtr(Src: Pointer; Alignment: Byte): Pointer;
begin
Result := Pointer(((PtrUInt(Src) + Alignment - 1) and not PtrUInt(Alignment - 1)));

53
components/lazutils/lazutf8.pas
View File

@ -126,6 +126,10 @@ function UTF8LowerCase(const AInStr: string; const ALanguage: string=''): string
function UTF8LowerString(const s: string): string; inline;
function UTF8UpperCase(const AInStr: string; const ALanguage: string=''): string;
function UTF8UpperString(const s: string): string; inline;
// Optimistic upper/lower case. Attempt ASCII only, but if non-ASCII is found, do UTF8
function UTF8UpperCaseFast(const AText: String): String;
function UTF8LowerCaseFast(const AText: String): String;
function UTF8SwapCase(const AInStr: string; const ALanguage: string=''): string;
// Capitalize the first letters of every word
function UTF8ProperCase(const AInStr: string; const WordDelims: TSysCharSet): string;
@ -2872,6 +2876,55 @@ begin
Result:=UTF8UpperCase(s);
end;
function UTF8UpperCaseFast(const AText: String): String;
var
src, dst: PChar;
c: Integer;
t: Char;
begin
SetLength(Result, Length(AText));
if Result = '' then
exit;
src := @AText[1];
dst := @Result[1];
c := Length(Result);
while c > 0 do begin
t := src^;
if (ord(t) and 128) <> 0 then
exit(UTF8UpperCase(AText));
if (t in ['a'..'z']) then
t := chr(ord(t) - 32);
dst^ := t;
dec(c);
inc(src);
inc(dst);
end;
end;
function UTF8LowerCaseFast(const AText: String): String;
var
src, dst: PChar;
c: Integer;
t: Char;
begin
SetLength(Result, Length(AText));
if Result = '' then
exit;
src := @AText[1];
dst := @Result[1];
c := Length(Result);
while c > 0 do begin
t := src^;
if (ord(t) and 128) <> 0 then
exit(UTF8UpperCase(AText));
if (t in ['A'..'Z']) then
t := chr(ord(t) + 32);
dst^ := t;
dec(c);
inc(src);
inc(dst);
end;
end;
function FindInvalidUTF8Codepoint(p: PChar; Count: PtrInt; StopOnNonUTF8: Boolean): PtrInt;
// return -1 if ok