peiyongz 2004/04/26 14:17:54
Modified: c/src/xercesc/internal DGXMLScanner.cpp IGXMLScanner.cpp
XMLScanner.cpp
Log:
EMPTY element has no comment/PI: code re-org
Revision Changes Path
1.44 +1 -3 xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp
Index: DGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/DGXMLScanner.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- DGXMLScanner.cpp 23 Apr 2004 21:19:59 -0000 1.43
+++ DGXMLScanner.cpp 26 Apr 2004 21:17:54 -0000 1.44
@@ -582,7 +582,6 @@
case Token_Comment :
scanComment();
- fElemStack.setCommentOrPISeen();
break;
case Token_EndTag :
@@ -591,7 +590,6 @@
case Token_PI :
scanPI();
- fElemStack.setCommentOrPISeen();
break;
case Token_StartTag :
1.66 +1 -3 xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp
Index: IGXMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/IGXMLScanner.cpp,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- IGXMLScanner.cpp 23 Apr 2004 21:19:59 -0000 1.65
+++ IGXMLScanner.cpp 26 Apr 2004 21:17:54 -0000 1.66
@@ -911,7 +911,6 @@
case Token_Comment :
scanComment();
- fElemStack.setCommentOrPISeen();
break;
case Token_EndTag :
@@ -920,7 +919,6 @@
case Token_PI :
scanPI();
- fElemStack.setCommentOrPISeen();
break;
case Token_StartTag :
1.65 +12 -1 xml-xerces/c/src/xercesc/internal/XMLScanner.cpp
Index: XMLScanner.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/internal/XMLScanner.cpp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- XMLScanner.cpp 13 Apr 2004 16:56:58 -0000 1.64
+++ XMLScanner.cpp 26 Apr 2004 21:17:54 -0000 1.65
@@ -1171,6 +1171,11 @@
, targetPtr
);
}
+
+ //mark PI is seen within the current element
+ if (! fElemStack.isEmpty())
+ fElemStack.setCommentOrPISeen();
+
}
// Scans all the input from the start of the file to the root element.
@@ -2047,6 +2052,7 @@
// it to.
void XMLScanner::scanComment()
{
+
enum States
{
InText
@@ -2152,6 +2158,11 @@
bbComment.getRawBuffer()
);
}
+
+ //mark comment is seen within the current element
+ if (! fElemStack.isEmpty())
+ fElemStack.setCommentOrPISeen();
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
