Browse Source

xmlread.pp, r16175 caused a regression in level1/core/commentgetcomment; we should ignore comments in DTD, but not between DTD and root element. Fixed.

git-svn-id: trunk@16183 -
sergei 15 years ago
parent
commit
dfe1c0f228
1 changed files with 2 additions and 1 deletions
  1. 2 1
      packages/fcl-xml/src/xmlread.pp

+ 2 - 1
packages/fcl-xml/src/xmlread.pp

@@ -317,7 +317,7 @@ type
 
 
   TNodeDataDynArray = array of TNodeData;
   TNodeDataDynArray = array of TNodeData;
 
 
-  TXMLReadState = (rsProlog, rsDTD, rsRoot, rsEpilog);
+  TXMLReadState = (rsProlog, rsDTD, rsAfterDTD, rsRoot, rsEpilog);
 
 
   TElementContentType = (
   TElementContentType = (
     ctUndeclared,
     ctUndeclared,
@@ -2183,6 +2183,7 @@ begin
   end;
   end;
   ValidateDTD;
   ValidateDTD;
   FDocType.SetReadOnly(True);
   FDocType.SetReadOnly(True);
+  FState := rsAfterDTD;
 end;
 end;
 
 
 procedure TXMLReader.ExpectEq;   // [25]
 procedure TXMLReader.ExpectEq;   // [25]