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

* Skip UTF-8 BOM in TParser (classes) and dfmreader (fcl-res)

Browse Source 
git-svn-id: trunk@14292 -
This commit is contained in:
giulio2 2009-11-30 21:55:25 +00:00
parent f191ab39cd
commit d257b19798
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/fcl-res/src/dfmreader.pp
View File

@ -131,6 +131,9 @@ begin
fLine:='';
while fLine='' do
ReadLine(aStream);
//skip UTF-8 BOM, if needed
if (copy(fLine,1,3)=(#$EF+#$BB+#$BF)) then
inc(fLinePos,3);
tmp:=lowercase(GetIdent);
if (tmp <> 'object') and (tmp<>'inherited') then exit;
if GetIdent='' then exit;

1
rtl/objpas/classes/classesh.inc
View File

@ -1414,6 +1414,7 @@ type
function GetHexValue(c : char) : byte; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
function GetAlphaNum : string;
procedure HandleNewLine;
procedure SkipBOM;
procedure SkipSpaces;
procedure SkipWhitespace;
procedure HandleEof;

20
rtl/objpas/classes/parser.inc
View File

@ -119,6 +119,25 @@ begin
fDeltaPos:=-(fPos-1);
end;
procedure TParser.SkipBOM;
var
i : integer;
bom : string[3];
backup : integer;
begin
i:=1;
bom:=' ';
backup:=fPos;
while (fBuf[fPos] in [#$BB,#$BF,#$EF]) and (i<=3) do
begin
bom[i]:=fBuf[fPos];
inc(fPos);
inc(i);
end;
if (bom<>(#$EF+#$BB+#$BF)) then
fPos:=backup;
end;
procedure TParser.SkipSpaces;
begin
while fBuf[fPos] in [' ',#9] do
@ -304,6 +323,7 @@ begin
fFloatType:=#0;
fToken:=#0;
LoadBuffer;
SkipBom;
NextToken;
end;