diff --git a/ChangeLog b/ChangeLog index af7bd0cb..c40a8219 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Dec 16 23:00:05 CET 2002 Daniel Veillard + + * parser.c: Vyacheslav Pindyura managed to trigger a bug in + parseStartTag, fixing it. + * test/att4 result/att4 result/noent/att4: adding the test + * xmlreader.c include/libxml/xmlreader.h doc/libxml2-api.xml: added + more methods to XmlTextReader. + Mon Dec 16 19:31:16 CET 2002 Igor Zlatkovic * win32/libxml2.def.src: added more xml reader exports diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml index 14b81038..ce8479c3 100644 --- a/doc/libxml2-api.xml +++ b/doc/libxml2-api.xml @@ -1114,10 +1114,15 @@ + + + + + @@ -8002,6 +8007,11 @@ actually an xmlCharEncoding'/> + + The value indicating whether to normalize white space and attribute values. Since attribute value and end of line normalizations are a MUST in the XML specification only the value true is accepted. The broken bahaviour of accepting out of range character entities like � is of course not supported either. + + + A shorthand reference to the namespace associated with the node. @@ -8017,6 +8027,26 @@ actually an xmlCharEncoding'/> + + Reads the contents of the current node, including child nodes and markup. + + + + + Reads the contents of the current node, including child nodes and markup. + + + + + Gets the read state of the reader. + + + + + Reads the contents of an element or a text node as a string. + + + Provides the text value of the node if present diff --git a/include/libxml/xmlreader.h b/include/libxml/xmlreader.h index ac3737cd..0acd61b4 100644 --- a/include/libxml/xmlreader.h +++ b/include/libxml/xmlreader.h @@ -30,6 +30,9 @@ void xmlFreeTextReader (xmlTextReaderPtr reader); * Iterators */ int xmlTextReaderRead (xmlTextReaderPtr reader); +xmlChar * xmlTextReaderReadInnerXml (xmlTextReaderPtr reader); +xmlChar * xmlTextReaderReadOuterXml (xmlTextReaderPtr reader); +xmlChar * xmlTextReaderReadString (xmlTextReaderPtr reader); /* * Attributes of the node @@ -49,6 +52,7 @@ xmlChar * xmlTextReaderPrefix (xmlTextReaderPtr reader); int xmlTextReaderQuoteChar (xmlTextReaderPtr reader); xmlChar * xmlTextReaderValue (xmlTextReaderPtr reader); xmlChar * xmlTextReaderXmlLang (xmlTextReaderPtr reader); +int xmlTextReaderReadState (xmlTextReaderPtr reader); /* * Methods of the XmlTextReader @@ -74,6 +78,7 @@ int xmlTextReaderMoveToAttributeNs (xmlTextReaderPtr reader, int xmlTextReaderMoveToFirstAttribute(xmlTextReaderPtr reader); int xmlTextReaderMoveToNextAttribute(xmlTextReaderPtr reader); int xmlTextReaderMoveToElement (xmlTextReaderPtr reader); +int xmlTextReaderNormalization (xmlTextReaderPtr reader); #ifdef __cplusplus } diff --git a/parser.c b/parser.c index f68c4242..16daa80e 100644 --- a/parser.c +++ b/parser.c @@ -6688,6 +6688,9 @@ xmlParseStartTag(xmlParserCtxtPtr ctxt) { failed: + if (CUR == 0) { + GROW + } if ((RAW == '>') || (((RAW == '/') && (NXT(1) == '>')))) break; if (!IS_BLANK(RAW)) { diff --git a/python/libxml2class.txt b/python/libxml2class.txt index b303384e..10155f6a 100644 --- a/python/libxml2class.txt +++ b/python/libxml2class.txt @@ -586,9 +586,14 @@ Class xmlTextReader() name() namespaceUri() nodeType() + normalization() prefix() quoteChar() read() + readInnerXml() + readOuterXml() + readState() + readString() value() xmlLang() Class xmlReg() diff --git a/result/att4 b/result/att4 new file mode 100644 index 00000000..882cea74 --- /dev/null +++ b/result/att4 @@ -0,0 +1,9264 @@ + + + + + + + diff --git a/result/noent/att4 b/result/noent/att4 new file mode 100644 index 00000000..882cea74 --- /dev/null +++ b/result/noent/att4 @@ -0,0 +1,9264 @@ + + + + + + + diff --git a/test/att4 b/test/att4 new file mode 100644 index 00000000..2e8bbca9 --- /dev/null +++ b/test/att4 @@ -0,0 +1,9264 @@ + + + + + + + diff --git a/xmlreader.c b/xmlreader.c index 91c11022..68632c6a 100644 --- a/xmlreader.c +++ b/xmlreader.c @@ -1,6 +1,10 @@ /* * xmlreader.c: implements the xmlTextReader streaming node API * + * NOTE: + * XmlTextReader.Normalization Property won't be supported, since + * it makes the parser non compliant to the XML recommendation + * * See Copyright for the status of this software. * * daniel@veillard.com @@ -52,9 +56,12 @@ #define XML_TEXTREADER_CTXT 2 typedef enum { - XML_TEXTREADER_MODE_NORMAL = 0, - XML_TEXTREADER_MODE_EOF = 1, - XML_TEXTREADER_MODE_CLOSED = 1 + XML_TEXTREADER_MODE_INITIAL = 0, + XML_TEXTREADER_MODE_INTERACTIVE = 1, + XML_TEXTREADER_MODE_ERROR = 2, + XML_TEXTREADER_MODE_EOF =3, + XML_TEXTREADER_MODE_CLOSED = 4, + XML_TEXTREADER_MODE_READING = 5 } xmlTextReaderMode; typedef enum { @@ -206,7 +213,7 @@ xmlTextReaderPushData(xmlTextReaderPtr reader) { * large CDATA sections */ if ((cur - reader->cur > 4096) && (reader->base == 0) && - (reader->mode == XML_TEXTREADER_MODE_NORMAL)) { + (reader->mode == XML_TEXTREADER_MODE_INTERACTIVE)) { cur = cur + 1; val = xmlParseChunk(reader->ctxt, (const char *) &inbuf->content[reader->cur], @@ -220,7 +227,7 @@ xmlTextReaderPushData(xmlTextReaderPtr reader) { /* * Discard the consumed input when needed and possible */ - if (reader->mode == XML_TEXTREADER_MODE_NORMAL) { + if (reader->mode == XML_TEXTREADER_MODE_INTERACTIVE) { if ((reader->cur >= 4096) && (reader->base == 0)) { val = xmlBufferShrink(inbuf, cur); if (val >= 0) { @@ -265,7 +272,8 @@ xmlTextReaderRead(xmlTextReaderPtr reader) { fprintf(stderr, "\nREAD "); DUMP_READER #endif - if (reader->node == NULL) { + if (reader->mode == XML_TEXTREADER_MODE_INITIAL) { + reader->mode = XML_TEXTREADER_MODE_INTERACTIVE; /* * Initial state */ @@ -365,6 +373,69 @@ xmlTextReaderRead(xmlTextReaderPtr reader) { return(1); } +/** + * xmlTextReaderReadState: + * @reader: the xmlTextReaderPtr used + * + * Gets the read state of the reader. + * + * Returns the state value, or -1 in case of error + */ +int +xmlTextReaderReadState(xmlTextReaderPtr reader) { + if (reader == NULL) + return(-1); + return(reader->mode); +} + +/** + * xmlTextReaderReadInnerXml: + * @reader: the xmlTextReaderPtr used + * + * Reads the contents of the current node, including child nodes and markup. + * + * Returns a string containing the XML content, or NULL if the current node + * is neither an element nor attribute, or has no child nodes. The + * string must be deallocated by the caller. + */ +xmlChar * +xmlTextReaderReadInnerXml(xmlTextReaderPtr reader) { + TODO + return(NULL); +} + +/** + * xmlTextReaderReadOuterXml: + * @reader: the xmlTextReaderPtr used + * + * Reads the contents of the current node, including child nodes and markup. + * + * Returns a string containing the XML content, or NULL if the current node + * is neither an element nor attribute, or has no child nodes. The + * string must be deallocated by the caller. + */ +xmlChar * +xmlTextReaderReadOuterXml(xmlTextReaderPtr reader) { + TODO + return(NULL); +} + +/** + * xmlTextReaderReadString: + * @reader: the xmlTextReaderPtr used + * + * Reads the contents of an element or a text node as a string. + * + * Returns a string containing the contents of the Element or Text node, + * or NULL if the reader is positioned on any other type of node. + * The string must be deallocated by the caller. + */ +xmlChar * +xmlTextReaderReadString(xmlTextReaderPtr reader) { + TODO + return(NULL); +} + /************************************************************************ * * * Constructor and destructors * @@ -406,7 +477,7 @@ xmlNewTextReader(xmlParserInputBufferPtr input) { ret->endElement = ret->sax->endElement; ret->sax->endElement = xmlTextReaderEndElement; - ret->mode = XML_TEXTREADER_MODE_NORMAL; + ret->mode = XML_TEXTREADER_MODE_INITIAL; ret->node = NULL; ret->curnode = NULL; val = xmlParserInputBufferRead(input, 4); @@ -1028,6 +1099,7 @@ int xmlTextReaderAttributeCount(xmlTextReaderPtr reader) { int ret; xmlAttrPtr attr; + xmlNsPtr ns; xmlNodePtr node; if (reader == NULL) @@ -1051,6 +1123,11 @@ xmlTextReaderAttributeCount(xmlTextReaderPtr reader) { ret++; attr = attr->next; } + ns = node->nsDef; + while (ns != NULL) { + ret++; + ns = ns->next; + } return(ret); } @@ -1493,3 +1570,22 @@ xmlTextReaderXmlLang(xmlTextReaderPtr reader) { return(xmlNodeGetLang(reader->node)); } +/** + * xmlTextReaderNormalization: + * @reader: the xmlTextReaderPtr used + * + * The value indicating whether to normalize white space and attribute values. + * Since attribute value and end of line normalizations are a MUST in the XML + * specification only the value true is accepted. The broken bahaviour of + * accepting out of range character entities like � is of course not + * supported either. + * + * Returns 1 or -1 in case of error. + */ +int +xmlTextReaderNormalization(xmlTextReaderPtr reader) { + if (reader == NULL) + return(-1); + return(1); +} +