Menu
▾
▴
[Jcl-checkins-diff] SF.net SVN: jcl:[2431] trunk/jcl/source/common
|
From: <ou...@us...> - 2008-08-17 22:13:39
|
Revision: 2431
http://jcl.svn.sourceforge.net/jcl/?rev=2431&view=rev
Author: outchy
Date: 2008-08-17 22:13:36 +0000 (Sun, 17 Aug 2008)
Log Message:
-----------
Renamed function to prevent possible mis-resolution with functions of the same name.
Modified Paths:
--------------
trunk/jcl/source/common/JclStreams.pas
trunk/jcl/source/common/JclStringConversions.pas
Modified: trunk/jcl/source/common/JclStreams.pas
===================================================================
--- trunk/jcl/source/common/JclStreams.pas 2008-08-17 15:08:11 UTC (rev 2430)
+++ trunk/jcl/source/common/JclStreams.pas 2008-08-17 22:13:36 UTC (rev 2431)
@@ -27,7 +27,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -2811,8 +2811,8 @@
begin
inherited Create(AStream, AOwnsStream);
// not adding the @ character causes an internal error in Delphi 5 and C++Builder 5
- FCharacterReader := {$IFNDEF CLR}@{$ENDIF ~CLR}AnsiGetNextChar;
- FCharacterWriter := {$IFNDEF CLR}@{$ENDIF ~CLR}AnsiSetNextChar;
+ FCharacterReader := {$IFNDEF CLR}@{$ENDIF ~CLR}AnsiGetNextCharFromStream;
+ FCharacterWriter := {$IFNDEF CLR}@{$ENDIF ~CLR}AnsiSetNextCharToStream;
SetLength(FBOM, 0);
end;
@@ -2823,8 +2823,8 @@
I: Integer;
begin
inherited Create(AStream, AOwnsStream);
- FCharacterReader := {$IFNDEF CLR}@{$ENDIF ~CLR}UTF8GetNextChar;
- FCharacterWriter := {$IFNDEF CLR}@{$ENDIF ~CLR}UTF8SetNextChar;
+ FCharacterReader := {$IFNDEF CLR}@{$ENDIF ~CLR}UTF8GetNextCharFromStream;
+ FCharacterWriter := {$IFNDEF CLR}@{$ENDIF ~CLR}UTF8SetNextCharToStream;
SetLength(FBOM, Length(BOM_UTF8));
for I := Low(BOM_UTF8) to High(BOM_UTF8) do
FBOM[I - Low(BOM_UTF8)] := BOM_UTF8[I];
@@ -2837,8 +2837,8 @@
I: Integer;
begin
inherited Create(AStream, AOwnsStream);
- FCharacterReader := {$IFNDEF CLR}@{$ENDIF ~CLR}UTF16GetNextChar;
- FCharacterWriter := {$IFNDEF CLR}@{$ENDIF ~CLR}UTF16SetNextChar;
+ FCharacterReader := {$IFNDEF CLR}@{$ENDIF ~CLR}UTF16GetNextCharFromStream;
+ FCharacterWriter := {$IFNDEF CLR}@{$ENDIF ~CLR}UTF16SetNextCharToStream;
SetLength(FBOM, Length(BOM_UTF16_LSB));
for I := Low(BOM_UTF16_LSB) to High(BOM_UTF16_LSB) do
FBOM[I - Low(BOM_UTF16_LSB)] := BOM_UTF16_LSB[I];
Modified: trunk/jcl/source/common/JclStringConversions.pas
===================================================================
--- trunk/jcl/source/common/JclStringConversions.pas 2008-08-17 15:08:11 UTC (rev 2430)
+++ trunk/jcl/source/common/JclStringConversions.pas 2008-08-17 22:13:36 UTC (rev 2431)
@@ -34,7 +34,7 @@
{ }
{**************************************************************************************************}
{ }
-{ Last modified: $Date:: $ }
+{ Last modified: $Date:: $ }
{ Revision: $Rev:: $ }
{ Author: $Author:: $ }
{ }
@@ -79,16 +79,16 @@
// if UNICODE_SILENT_FAILURE is defined, invalid sequences will be replaced by ReplacementCharacter
// otherwise StrPos is set to -1 on return to flag an error (invalid UTF8 sequence)
// StrPos will be incremented by the number of chars that were read
-function UTF8GetNextChar(const S: TUTF8String; var StrPos: Integer): UCS4; overload;
-function UTF8GetNextChar(S: TStream; var Ch: UCS4): Boolean; overload;
+function UTF8GetNextChar(const S: TUTF8String; var StrPos: Integer): UCS4;
+function UTF8GetNextCharFromStream(S: TStream; var Ch: UCS4): Boolean;
// UTF8SkipChars = skip NbSeq UTF8 sequences starting from StrPos
// returns False if String is too small
// if UNICODE_SILENT_FAILURE is not defined StrPos is set to -1 on error (invalid UTF8 sequence)
// StrPos will be incremented by the number of chars that were skipped
// On return, NbSeq contains the number of UTF8 sequences that were skipped
-function UTF8SkipChars(const S: TUTF8String; var StrPos: Integer; var NbSeq: Integer): Boolean; overload;
-function UTF8SkipChars(S: TStream; var NbSeq: Integer): Boolean; overload;
+function UTF8SkipChars(const S: TUTF8String; var StrPos: Integer; var NbSeq: Integer): Boolean;
+function UTF8SkipCharsFromStream(S: TStream; var NbSeq: Integer): Boolean;
// UTF8SetNextChar = append an UTF8 sequence at StrPos
// returns False on error:
@@ -97,29 +97,29 @@
// - if UNICODE_SILENT_FAILURE is not defined, StrPos is set to -1
// - StrPos > -1 flags string being too small, callee did nothing, caller is responsible for allocating space
// StrPos will be incremented by the number of chars that were written
-function UTF8SetNextChar(var S: TUTF8String; var StrPos: Integer; Ch: UCS4): Boolean; overload;
-function UTF8SetNextChar(S: TStream; Ch: UCS4): Boolean; overload;
+function UTF8SetNextChar(var S: TUTF8String; var StrPos: Integer; Ch: UCS4): Boolean;
+function UTF8SetNextCharToStream(S: TStream; Ch: UCS4): Boolean;
// UTF16GetNextChar = read next UTF16 sequence at StrPos
// if UNICODE_SILENT_FAILURE is defined, invalid sequences will be replaced by ReplacementCharacter
// otherwise StrPos is set to -1 on return to flag an error (invalid UTF16 sequence)
// StrPos will be incremented by the number of chars that were read
-function UTF16GetNextChar(const S: TUTF16String; var StrPos: Integer): UCS4; overload;
-function UTF16GetNextChar(S: TStream; var Ch: UCS4): Boolean; overload;
+function UTF16GetNextChar(const S: TUTF16String; var StrPos: Integer): UCS4;
+function UTF16GetNextCharFromStream(S: TStream; var Ch: UCS4): Boolean;
// UTF16GetPreviousChar = read previous UTF16 sequence starting at StrPos-1
// if UNICODE_SILENT_FAILURE is defined, invalid sequences will be replaced by ReplacementCharacter
// otherwise StrPos is set to -1 on return to flag an error (invalid UTF16 sequence)
// StrPos will be decremented by the number of chars that were read
-function UTF16GetPreviousChar(const S: TUTF16String; var StrPos: Integer): UCS4; overload;
+function UTF16GetPreviousChar(const S: TUTF16String; var StrPos: Integer): UCS4;
// UTF16SkipChars = skip NbSeq UTF16 sequences starting from StrPos
// returns False if String is too small
// if UNICODE_SILENT_FAILURE is not defined StrPos is set to -1 on error (invalid UTF16 sequence)
// StrPos will be incremented by the number of chars that were skipped
// On return, NbChar contains the number of UTF16 sequences that were skipped
-function UTF16SkipChars(const S: TUTF16String; var StrPos: Integer; var NbSeq: Integer): Boolean; overload;
-function UTF16SkipChars(S: TStream; var NbSeq: Integer): Boolean; overload;
+function UTF16SkipChars(const S: TUTF16String; var StrPos: Integer; var NbSeq: Integer): Boolean;
+function UTF16SkipCharsFromStream(S: TStream; var NbSeq: Integer): Boolean;
// UTF16SetNextChar = append an UTF16 sequence at StrPos
// returns False on error:
@@ -128,20 +128,20 @@
// - if UNICODE_SILENT_FAILURE is not defined, StrPos is set to -1
// - StrPos > -1 flags string being too small, callee did nothing and caller is responsible for allocating space
// StrPos will be incremented by the number of chars that were written
-function UTF16SetNextChar(var S: TUTF16String; var StrPos: Integer; Ch: UCS4): Boolean; overload;
-function UTF16SetNextChar(S: TStream; Ch: UCS4): Boolean; overload;
+function UTF16SetNextChar(var S: TUTF16String; var StrPos: Integer; Ch: UCS4): Boolean;
+function UTF16SetNextCharToStream(S: TStream; Ch: UCS4): Boolean;
// AnsiGetNextChar = read next character at StrPos
// StrPos will be incremented by the number of chars that were read (1)
-function AnsiGetNextChar(const S: AnsiString; var StrPos: Integer): UCS4; overload;
-function AnsiGetNextChar(S: TStream; var Ch: UCS4): Boolean; overload;
+function AnsiGetNextChar(const S: AnsiString; var StrPos: Integer): UCS4;
+function AnsiGetNextCharFromStream(S: TStream; var Ch: UCS4): Boolean;
// AnsiSkipChars = skip NbSeq characters starting from StrPos
// returns False if String is too small
// StrPos will be incremented by the number of chars that were skipped
// On return, NbChar contains the number of UTF16 sequences that were skipped
-function AnsiSkipChars(const S: AnsiString; var StrPos: Integer; var NbSeq: Integer): Boolean; overload;
-function AnsiSkipChars(S: TStream; var NbSeq: Integer): Boolean; overload;
+function AnsiSkipChars(const S: AnsiString; var StrPos: Integer; var NbSeq: Integer): Boolean;
+function AnsiSkipCharsFromStream(S: TStream; var NbSeq: Integer): Boolean;
// AnsiSetNextChar = append a character at StrPos
// returns False on error:
@@ -150,8 +150,8 @@
// - if UNICODE_SILENT_FAILURE is not defined, StrPos is set to -1
// - StrPos > -1 flags string being too small, callee did nothing and caller is responsible for allocating space
// StrPos will be incremented by the number of chars that were written (1)
-function AnsiSetNextChar(var S: AnsiString; var StrPos: Integer; Ch: UCS4): Boolean; overload;
-function AnsiSetNextChar(S: TStream; Ch: UCS4): Boolean; overload;
+function AnsiSetNextChar(var S: AnsiString; var StrPos: Integer; Ch: UCS4): Boolean;
+function AnsiSetNextCharToStream(S: TStream; Ch: UCS4): Boolean;
// StringGetNextChar = read next character/sequence at StrPos
// if UNICODE_SILENT_FAILURE is defined, invalid sequences will be replaced by ReplacementCharacter
@@ -556,7 +556,7 @@
end;
end;
-function UTF8GetNextChar(S: TStream; var Ch: UCS4): Boolean;
+function UTF8GetNextCharFromStream(S: TStream; var Ch: UCS4): Boolean;
var
B: Byte;
begin
@@ -827,7 +827,7 @@
NbSeq := Index;
end;
-function UTF8SkipChars(S: TStream; var NbSeq: Integer): Boolean;
+function UTF8SkipCharsFromStream(S: TStream; var NbSeq: Integer): Boolean;
var
B: Byte;
Index: Integer;
@@ -1057,7 +1057,7 @@
end;
end;
-function UTF8SetNextChar(S: TStream; Ch: UCS4): Boolean;
+function UTF8SetNextCharToStream(S: TStream; Ch: UCS4): Boolean;
begin
if Ch <= $7F then
// 7 bits to store
@@ -1155,7 +1155,7 @@
end;
end;
-function UTF16GetNextChar(S: TStream; var Ch: UCS4): Boolean;
+function UTF16GetNextCharFromStream(S: TStream; var Ch: UCS4): Boolean;
var
W: Word;
begin
@@ -1319,7 +1319,7 @@
NbSeq := Index;
end;
-function UTF16SkipChars(S: TStream; var NbSeq: Integer): Boolean;
+function UTF16SkipCharsFromStream(S: TStream; var NbSeq: Integer): Boolean;
var
Index: Integer;
W: Word;
@@ -1405,7 +1405,7 @@
end;
end;
-function UTF16SetNextChar(S: TStream; Ch: UCS4): Boolean;
+function UTF16SetNextCharToStream(S: TStream; Ch: UCS4): Boolean;
begin
if Ch <= MaximumUCS2 then
// 16 bits to store in place
@@ -1453,7 +1453,7 @@
end;
end;
-function AnsiGetNextChar(S: TStream; var Ch: UCS4): Boolean;
+function AnsiGetNextCharFromStream(S: TStream; var Ch: UCS4): Boolean;
var
B: Byte;
TmpPos: Integer;
@@ -1502,7 +1502,7 @@
end;
end;
-function AnsiSkipChars(S: TStream; var NbSeq: Integer): Boolean;
+function AnsiSkipCharsFromStream(S: TStream; var NbSeq: Integer): Boolean;
var
Index: Integer;
B: Byte;
@@ -1568,7 +1568,7 @@
end;
end;
-function AnsiSetNextChar(S: TStream; Ch: UCS4): Boolean;
+function AnsiSetNextCharToStream(S: TStream; Ch: UCS4): Boolean;
var
TmpPos: Integer;
UTF16Buffer: TUTF16String;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|