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

* Second patch from Mattias Gaertner (bug 19623, should fix 19633 as well)

Browse Source 
git-svn-id: trunk@17845 -
This commit is contained in:
michael 2011-06-27 18:34:25 +00:00
parent 548ee755b1
commit 0d14fc2851
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,15 +41,11 @@ var
BytesRead: integer; BytesRead: integer;
begin begin
BytesRead := FStream.Read(FBuf^, ParseBufSize); BytesRead := FStream.Read(FBuf^, ParseBufSize);
if BytesRead = 0 then
begin
FEofReached := True;
Exit;
end;
FBuf[BytesRead] := #0; FBuf[BytesRead] := #0;
Inc(FDeltaPos, BytesRead); Inc(FDeltaPos, BytesRead);
FPos := 0; FPos := 0;
FBufLen := BytesRead; FBufLen := BytesRead;
FEofReached:=BytesRead = 0;
end; end;
procedure TParser.CheckLoadBuffer; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE} procedure TParser.CheckLoadBuffer; {$ifdef CLASSESINLINE} inline; {$endif CLASSESINLINE}
@ -112,9 +108,12 @@ begin
begin begin
inc(fPos); inc(fPos);
CheckLoadBuffer; CheckLoadBuffer;
if fBuf[fPos]=#10 then inc(fPos); //CR LF end;
end if fBuf[fPos]=#10 then
else inc(fPos); //LF begin
inc(fPos); //CR LF or LF
CheckLoadBuffer;
end;
inc(fSourceLine); inc(fSourceLine);
fDeltaPos:=-(fPos-1); fDeltaPos:=-(fPos-1);
end; end;
@ -132,6 +131,7 @@ begin
begin begin
bom[i]:=fBuf[fPos]; bom[i]:=fBuf[fPos];
inc(fPos); inc(fPos);
CheckLoadBuffer;
inc(i); inc(i);
end; end;
if (bom<>(#$EF+#$BB+#$BF)) then if (bom<>(#$EF+#$BB+#$BF)) then
@ -140,15 +140,16 @@ end;
procedure TParser.SkipSpaces; procedure TParser.SkipSpaces;
begin begin
while fBuf[fPos] in [' ',#9] do while fBuf[fPos] in [' ',#9] do begin
inc(fPos); inc(fPos);
CheckLoadBuffer;
end;
end; end;
procedure TParser.SkipWhitespace; procedure TParser.SkipWhitespace;
begin begin
while true do while true do
begin begin
CheckLoadBuffer;
case fBuf[fPos] of case fBuf[fPos] of
' ',#9 : SkipSpaces; ' ',#9 : SkipSpaces;
#10,#13 : HandleNewLine #10,#13 : HandleNewLine
@ -205,6 +206,7 @@ begin
begin begin
fFloatType:=fBuf[fPos]; fFloatType:=fBuf[fPos];
inc(fPos); inc(fPos);
CheckLoadBuffer;
fToken:=toFloat; fToken:=toFloat;
end end
else fFloatType:=#0; else fFloatType:=#0;
@ -330,6 +332,7 @@ begin
fToken:=fBuf[fPos]; fToken:=fBuf[fPos];
fLastTokenStr:=fToken; fLastTokenStr:=fToken;
inc(fPos); inc(fPos);
CheckLoadBuffer;
end; end;
constructor TParser.Create(Stream: TStream); constructor TParser.Create(Stream: TStream);
@ -400,6 +403,7 @@ begin
Error(SParUnterminatedBinValue); Error(SParUnterminatedBinValue);
b:=b or GetHexValue(fBuf[fPos]); b:=b or GetHexValue(fBuf[fPos]);
inc(fPos); inc(fPos);
CheckLoadBuffer;
outbuf[i]:=b; outbuf[i]:=b;
inc(i); inc(i);
if i>=ParseBufSize then if i>=ParseBufSize then