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

* xmlread.pp, removed FRecognizePE field. Its functionality is replaced by checking other fields.

Browse Source 
git-svn-id: trunk@15984 -
This commit is contained in:
sergei 2010-09-14 12:53:55 +00:00
parent cd196c5622
commit 3bef71aaf9
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/fcl-xml/src/xmlread.pp
View File

@ -318,7 +318,6 @@ type
FCtrl: TDOMParser; FCtrl: TDOMParser;
FXML11: Boolean; FXML11: Boolean;
FState: TXMLReadState; FState: TXMLReadState;
FRecognizePE: Boolean;
FHavePERefs: Boolean; FHavePERefs: Boolean;
FInsideDecl: Boolean; FInsideDecl: Boolean;
FValue: TWideCharBuf; FValue: TWideCharBuf;
@ -1160,7 +1159,7 @@ begin
end end
else if FSource.FBuf^ = '%' then else if FSource.FBuf^ = '%' then
begin begin
if not FRecognizePE then if (FState <> rsDTD) or ((FSource.DTDSubsetType = dsInternal) and FInsideDecl) then
Break; Break;
// This is the only case where look-ahead is needed // This is the only case where look-ahead is needed
if FSource.FBuf > FSource.FBufEnd-2 then if FSource.FBuf > FSource.FBufEnd-2 then
@ -2558,9 +2557,7 @@ begin
IncludeLevel := 0; IncludeLevel := 0;
IgnoreLevel := 0; IgnoreLevel := 0;
repeat repeat
FRecognizePE := True; // PERef between declarations should always be recognized
SkipWhitespace; SkipWhitespace;
FRecognizePE := False;
if (FSource.FBuf^ = ']') and (IncludeLevel > 0) then if (FSource.FBuf^ = ']') and (IncludeLevel > 0) then
begin begin
@ -2586,7 +2583,6 @@ begin
if FSource.DTDSubsetType = dsInternal then if FSource.DTDSubsetType = dsInternal then
FatalError('Conditional sections are not allowed in internal subset', 1); FatalError('Conditional sections are not allowed in internal subset', 1);
FRecognizePE := True;
SkipWhitespace; SkipWhitespace;
CondType := ctUnknown; // satisfy compiler CondType := ctUnknown; // satisfy compiler
@ -2627,7 +2623,6 @@ begin
end end
else else
begin begin
FRecognizePE := FSource.DTDSubsetType <> dsInternal;
FInsideDecl := True; FInsideDecl := True;
if FSource.Matches('ELEMENT') then if FSource.Matches('ELEMENT') then
ParseElementDecl ParseElementDecl
@ -2641,7 +2636,6 @@ begin
FatalError('Illegal markup declaration'); FatalError('Illegal markup declaration');
SkipWhitespace; SkipWhitespace;
FRecognizePE := False;
if CurrentEntity <> FSource.FEntity then if CurrentEntity <> FSource.FEntity then
BadPENesting; BadPENesting;
@ -2650,7 +2644,6 @@ begin
end; end;
end; end;
until False; until False;
FRecognizePE := False;
if IncludeLevel > 0 then if IncludeLevel > 0 then
DoErrorPos(esFatal, 'INCLUDE section is not closed', IncludeLoc); DoErrorPos(esFatal, 'INCLUDE section is not closed', IncludeLoc);
if (FSource.DTDSubsetType = dsInternal) and (FSource.FBuf^ = ']') then if (FSource.DTDSubsetType = dsInternal) and (FSource.FBuf^ = ']') then