paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-14 14:29:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

utils: unicode

Browse Source 
- remove unused variables
  - reduce some hints/warnings

git-svn-id: trunk@23923 -
This commit is contained in:
paul 2013-03-18 11:46:53 +00:00
parent 19132fc98d
commit cf760602ef
6 changed files with 31 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/unicode/cldrtest.pas
View File

@ -994,10 +994,7 @@ var
sequence, sequenceClean : TOrderedCharacters; sequence, sequenceClean : TOrderedCharacters;
statement : TReorderSequence; statement : TReorderSequence;
wfirst, wresult : TUCA_LineRecArray; wfirst, wresult : TUCA_LineRecArray;
i : Integer;
unicodeBook1, unicodeBook2 : unicodedata.TUCA_DataBook; unicodeBook1, unicodeBook2 : unicodedata.TUCA_DataBook;
keyA, keyB : TUCASortKey;
us : UnicodeString;
begin begin
statement.Clear(); statement.Clear();
test5_prepareWeigth(wfirst); test5_prepareWeigth(wfirst);
@ -1336,7 +1333,6 @@ var
statement : TReorderSequence; statement : TReorderSequence;
wfirst, wresult : TUCA_LineRecArray; wfirst, wresult : TUCA_LineRecArray;
unicodeBook1, unicodeBook2 : unicodedata.TUCA_DataBook; unicodeBook1, unicodeBook2 : unicodedata.TUCA_DataBook;
i : Integer;
begin begin
statement.Clear(); statement.Clear();
test8_prepareWeigth(wfirst); test8_prepareWeigth(wfirst);
@ -1856,10 +1852,7 @@ var
sequence, sequenceClean : TOrderedCharacters; sequence, sequenceClean : TOrderedCharacters;
statement : TReorderSequence; statement : TReorderSequence;
wfirst, wresult : TUCA_LineRecArray; wfirst, wresult : TUCA_LineRecArray;
i : Integer;
unicodeBook1, unicodeBook2 : unicodedata.TUCA_DataBook; unicodeBook1, unicodeBook2 : unicodedata.TUCA_DataBook;
keyA, keyB : TUCASortKey;
us : UnicodeString;
begin begin
statement.Clear(); statement.Clear();
test11_prepareWeigth(wfirst); test11_prepareWeigth(wfirst);

6
utils/unicode/cldrxml.pas
View File

@ -318,7 +318,7 @@ var
function ReadNextItem(const APos : Integer) : Integer; function ReadNextItem(const APos : Integer) : Integer;
var var
n, t : TDOMNode; n, t : TDOMNode;
s, contextStr : DOMString; contextStr : DOMString;
w : TReorderWeigthKind; w : TReorderWeigthKind;
isSimpleCharTag : Boolean; isSimpleCharTag : Boolean;
simpleCharTag : AnsiChar; simpleCharTag : AnsiChar;
@ -583,8 +583,8 @@ procedure ParseCollationDocument(
AMode : TCldrParserMode AMode : TCldrParserMode
); );
var var
rulesNodes, n : TDOMNode; n : TDOMNode;
collationsElement, rulesElement : TDOMElement; collationsElement : TDOMElement;
i, c : Integer; i, c : Integer;
item : TCldrCollationItem; item : TCldrCollationItem;
nl : TDOMNodeList; nl : TDOMNodeList;

2
utils/unicode/grbtree.pas
View File

@ -196,7 +196,7 @@ end;
class function TRBTree<T,KCOMP>.TreeCreateIterator() : PBaseIterator;static; class function TRBTree<T,KCOMP>.TreeCreateIterator() : PBaseIterator;static;
begin begin
Result := AllocMem(SizeOf(Result^)); Result := AllocMem(SizeOf(TBaseIterator));
end; end;
class procedure TRBTree<T,KCOMP>.TreeFreeIterator(AItem : PBaseIterator);static; class procedure TRBTree<T,KCOMP>.TreeFreeIterator(AItem : PBaseIterator);static;

65
utils/unicode/helper.pas
View File

@ -1017,9 +1017,9 @@ procedure ParseBlokcs(
ADataAStream : TMemoryStream; ADataAStream : TMemoryStream;
var ABlocks : TBlocks var ABlocks : TBlocks
); );
const READ_BUFFER_LENGTH = 1024*8; const
LINE_LENGTH = 1024; LINE_LENGTH = 1024;
DATA_LENGTH = 25000; DATA_LENGTH = 25000;
var var
p : PAnsiChar; p : PAnsiChar;
actualDataLen : Integer; actualDataLen : Integer;
@ -1028,7 +1028,7 @@ var
function NextLine() : Boolean; function NextLine() : Boolean;
var var
k, locOldPos : Integer; locOldPos : Integer;
locOldPointer : PAnsiChar; locOldPointer : PAnsiChar;
begin begin
Result := False; Result := False;
@ -1082,7 +1082,6 @@ var
procedure ParseLine(); procedure ParseLine();
var var
locCP : Cardinal;
locData : TBlockItemRec; locData : TBlockItemRec;
s : ansistring; s : ansistring;
begin begin
@ -1110,8 +1109,6 @@ var
end; end;
procedure Prepare(); procedure Prepare();
var
r : TPropRec;
begin begin
SetLength(ABlocks,DATA_LENGTH); SetLength(ABlocks,DATA_LENGTH);
actualDataLen := 0; actualDataLen := 0;
@ -1133,9 +1130,9 @@ procedure ParseProps(
ADataAStream : TMemoryStream; ADataAStream : TMemoryStream;
var APropList : TPropListLineRecArray var APropList : TPropListLineRecArray
); );
const READ_BUFFER_LENGTH = 1024*8; const
LINE_LENGTH = 1024; LINE_LENGTH = 1024;
DATA_LENGTH = 25000; DATA_LENGTH = 25000;
var var
p : PAnsiChar; p : PAnsiChar;
actualDataLen : Integer; actualDataLen : Integer;
@ -1144,7 +1141,7 @@ var
function NextLine() : Boolean; function NextLine() : Boolean;
var var
k, locOldPos : Integer; locOldPos : Integer;
locOldPointer : PAnsiChar; locOldPointer : PAnsiChar;
begin begin
Result := False; Result := False;
@ -1228,8 +1225,6 @@ var
end; end;
procedure Prepare(); procedure Prepare();
var
r : TPropRec;
begin begin
SetLength(APropList,DATA_LENGTH); SetLength(APropList,DATA_LENGTH);
actualDataLen := 0; actualDataLen := 0;
@ -1279,9 +1274,9 @@ procedure ParseHangulSyllableTypes(
ADataAStream : TMemoryStream; ADataAStream : TMemoryStream;
var ACodePointList : TCodePointRecArray var ACodePointList : TCodePointRecArray
); );
const READ_BUFFER_LENGTH = 1024*8; const
LINE_LENGTH = 1024; LINE_LENGTH = 1024;
DATA_LENGTH = 25000; DATA_LENGTH = 25000;
var var
p : PAnsiChar; p : PAnsiChar;
actualDataLen : Integer; actualDataLen : Integer;
@ -1290,7 +1285,7 @@ var
function NextLine() : Boolean; function NextLine() : Boolean;
var var
k, locOldPos : Integer; locOldPos : Integer;
locOldPointer : PAnsiChar; locOldPointer : PAnsiChar;
begin begin
Result := False; Result := False;
@ -1348,7 +1343,6 @@ var
procedure ParseLine(); procedure ParseLine();
var var
locCP : Cardinal;
locData : TCodePointRec; locData : TCodePointRec;
s : ansistring; s : ansistring;
begin begin
@ -1373,8 +1367,6 @@ var
end; end;
procedure Prepare(); procedure Prepare();
var
r : TPropRec;
begin begin
SetLength(ACodePointList,DATA_LENGTH); SetLength(ACodePointList,DATA_LENGTH);
actualDataLen := 0; actualDataLen := 0;
@ -1498,10 +1490,10 @@ procedure Parse_UnicodeData(
const AHangulList : TCodePointRecArray; const AHangulList : TCodePointRecArray;
const AWhiteSpaces : TCodePointRecArray const AWhiteSpaces : TCodePointRecArray
); );
const READ_BUFFER_LENGTH = 1024*8; const
LINE_LENGTH = 1024; LINE_LENGTH = 1024;
PROP_LENGTH = 5000; PROP_LENGTH = 5000;
DATA_LENGTH = 25000; DATA_LENGTH = 25000;
var var
p : PAnsiChar; p : PAnsiChar;
bufferLength, bufferPos : Integer; bufferLength, bufferPos : Integer;
@ -1511,7 +1503,7 @@ var
function NextLine() : Boolean; function NextLine() : Boolean;
var var
k, locOldPos : Integer; locOldPos : Integer;
locOldPointer : PAnsiChar; locOldPointer : PAnsiChar;
begin begin
Result := False; Result := False;
@ -1558,7 +1550,7 @@ var
function ParseCanonicalDecomposition(AStr : ansistring) : TUnicodeCodePointArray; function ParseCanonicalDecomposition(AStr : ansistring) : TUnicodeCodePointArray;
var var
locStr, ks : ansistring; locStr, ks : ansistring;
k0,k, cp : Integer; k0,k : Integer;
begin begin
SetLength(Result,0); SetLength(Result,0);
locStr := UpperCase(Trim(AStr)); locStr := UpperCase(Trim(AStr));
@ -2058,10 +2050,8 @@ procedure GeneratePropTable(
var var
i : Integer; i : Integer;
locLine : string; locLine : string;
pti : PTypeInfo;
p : PPropRec; p : PPropRec;
begin begin
pti := TypeInfo(TUnicodeCategory);
AddLine(''); AddLine('');
AddLine('const'); AddLine('const');
AddLine(' UC_PROP_REC_COUNT = ' + IntToStr(Length(APropList)) + ';'); AddLine(' UC_PROP_REC_COUNT = ' + IntToStr(Length(APropList)) + ';');
@ -2338,9 +2328,9 @@ procedure ParseUCAFile(
ADataAStream : TMemoryStream; ADataAStream : TMemoryStream;
var ABook : TUCA_DataBook var ABook : TUCA_DataBook
); );
const READ_BUFFER_LENGTH = 1024*8; const
LINE_LENGTH = 1024; LINE_LENGTH = 1024;
DATA_LENGTH = 25000; DATA_LENGTH = 25000;
var var
p : PAnsiChar; p : PAnsiChar;
actualDataLen : Integer; actualDataLen : Integer;
@ -2349,7 +2339,7 @@ var
function NextLine() : Boolean; function NextLine() : Boolean;
var var
k, locOldPos : Integer; locOldPos : Integer;
locOldPointer : PAnsiChar; locOldPointer : PAnsiChar;
begin begin
Result := False; Result := False;
@ -2485,7 +2475,6 @@ var
procedure ParseLine(); procedure ParseLine();
var var
locCP : Cardinal;
locData : ^TUCA_LineRec; locData : ^TUCA_LineRec;
s : ansistring; s : ansistring;
kc : Integer; kc : Integer;
@ -2526,7 +2515,6 @@ var
procedure Prepare(); procedure Prepare();
var var
r : TPropRec;
k : Integer; k : Integer;
begin begin
ABook.VariableWeight := ucaShifted; ABook.VariableWeight := ucaShifted;
@ -2653,7 +2641,6 @@ var
i, c : Integer; i, c : Integer;
p : PUCA_PropItemRec; p : PUCA_PropItemRec;
pw : PUCA_PropWeights; pw : PUCA_PropWeights;
w : TUCA_WeightRec;
pb : PByte; pb : PByte;
hasContext : Boolean; hasContext : Boolean;
contextTree : PUCA_PropItemContextTreeRec; contextTree : PUCA_PropItemContextTreeRec;
@ -2797,7 +2784,7 @@ function BuildTrie(
) : PTrieNode; ) : PTrieNode;
var var
p : PUCA_LineRec; p : PUCA_LineRec;
root, n : PTrieNode; root : PTrieNode;
ki, k, i : Integer; ki, k, i : Integer;
key : array of TKeyType; key : array of TKeyType;
begin begin
@ -2889,7 +2876,6 @@ var
i, c, k, kc : Integer; i, c, k, kc : Integer;
p, p1, p2 : PUCA_PropItemRec; p, p1, p2 : PUCA_PropItemRec;
lines, pl1, pl2 : PUCA_LineRec; lines, pl1, pl2 : PUCA_LineRec;
uc : Cardinal;
childCount, lineCount, size : Integer; childCount, lineCount, size : Integer;
trieRoot : PTrieNode; trieRoot : PTrieNode;
MaxChildCount, MaxSize : Integer; MaxChildCount, MaxSize : Integer;
@ -3279,7 +3265,7 @@ procedure GenerateUCA_PropTable(
end; end;
var var
i, j, c : Integer; i, c : Integer;
locLine : string; locLine : string;
p : PByte; p : PByte;
begin begin
@ -3801,7 +3787,7 @@ end;
procedure TUCA_PropItemRec.GetWeightArray(ADest: PUCA_PropWeights); procedure TUCA_PropItemRec.GetWeightArray(ADest: PUCA_PropWeights);
var var
i, c : Integer; c : Integer;
p : PByte; p : PByte;
pd : PUCA_PropWeights; pd : PUCA_PropWeights;
begin begin
@ -3931,7 +3917,6 @@ function ConstructContextTree(
function CalcItemOnlySize(AItem : TAVLTreeNode) : Cardinal; function CalcItemOnlySize(AItem : TAVLTreeNode) : Cardinal;
var var
kc : Integer;
kitem : PUCA_LineContextItemRec; kitem : PUCA_LineContextItemRec;
begin begin
if (AItem = nil) then if (AItem = nil) then

4
utils/unicode/trie.pas
View File

@ -107,7 +107,7 @@ function InsertWord(
const AValue : TDataType const AValue : TDataType
) : Boolean; ) : Boolean;
var var
p, q : PTrieNode; p : PTrieNode;
i, k, c : Integer; i, k, c : Integer;
searching : TKeyType; searching : TKeyType;
found : Boolean; found : Boolean;
@ -116,7 +116,6 @@ begin
if (ARoot^.Key <> AWord[0]) then if (ARoot^.Key <> AWord[0]) then
exit; exit;
p := ARoot; p := ARoot;
q := p;
i := 1; i := 1;
c := Length(AWord); c := Length(AWord);
while (i < c) do begin while (i < c) do begin
@ -124,7 +123,6 @@ begin
found := False; found := False;
for k := 0 to p^.ChildCount - 1 do begin for k := 0 to p^.ChildCount - 1 do begin
if (p^.Children[k]^.Key = searching) then begin if (p^.Children[k]^.Key = searching) then begin
q := p;
p := p^.Children[k]; p := p^.Children[k];
found := True; found := True;
Break; Break;

2
utils/unicode/unicodeset.pas
View File

@ -292,7 +292,7 @@ end;
procedure TPatternParser.ParseItem(); procedure TPatternParser.ParseItem();
var var
cp, lastCp : TUnicodeCodePoint; cp, lastCp : TUnicodeCodePoint;
charCount, i : Integer; charCount : Integer;
begin begin
SkipSpaces(); SkipSpaces();
Expect('['); Expect('[');