Overview
| Comment: | Skip over the prolog in OFXMLParser. Will be parsed someday. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
e7801f415e087e8a60c70ec8435740ea |
| User & Date: | js on 2010-07-03 17:15:13 |
| Other Links: | manifest | tags |
Context
|
2010-07-03
| ||
| 17:26 | Update Xcode Project to include new files. check-in: 9222bf45fa user: js tags: trunk | |
| 17:15 | Skip over the prolog in OFXMLParser. Will be parsed someday. check-in: e7801f415e user: js tags: trunk | |
|
2010-07-02
| ||
| 21:56 | Add -[writeToFile:] to OFString. check-in: aed0aea0b2 user: js tags: trunk | |
Changes
Modified src/OFXMLParser.h from [31713b74e0] to [bbfb693f5f].
| ︙ | ︙ | |||
101 102 103 104 105 106 107 108 109 110 111 112 113 114 |
*/
@interface OFXMLParser: OFObject <OFStringXMLUnescapingDelegate>
{
OFObject <OFXMLParserDelegate> *delegate;
enum {
OF_XMLPARSER_OUTSIDE_TAG,
OF_XMLPARSER_TAG_OPENED,
OF_XMLPARSER_IN_TAG_NAME,
OF_XMLPARSER_IN_CLOSE_TAG_NAME,
OF_XMLPARSER_IN_TAG,
OF_XMLPARSER_IN_ATTR_NAME,
OF_XMLPARSER_EXPECT_DELIM,
OF_XMLPARSER_IN_ATTR_VALUE,
OF_XMLPARSER_EXPECT_CLOSE,
| > | 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 |
*/
@interface OFXMLParser: OFObject <OFStringXMLUnescapingDelegate>
{
OFObject <OFXMLParserDelegate> *delegate;
enum {
OF_XMLPARSER_OUTSIDE_TAG,
OF_XMLPARSER_TAG_OPENED,
OF_XMLPARSER_IN_PROLOG,
OF_XMLPARSER_IN_TAG_NAME,
OF_XMLPARSER_IN_CLOSE_TAG_NAME,
OF_XMLPARSER_IN_TAG,
OF_XMLPARSER_IN_ATTR_NAME,
OF_XMLPARSER_EXPECT_DELIM,
OF_XMLPARSER_IN_ATTR_VALUE,
OF_XMLPARSER_EXPECT_CLOSE,
|
| ︙ | ︙ |
Modified src/OFXMLParser.m from [6520243b50] to [f763218ad7].
| ︙ | ︙ | |||
148 149 150 151 152 153 154 | last = i + 1; state = OF_XMLPARSER_TAG_OPENED; } break; /* Tag was just opened */ case OF_XMLPARSER_TAG_OPENED: | | > > | > > < | > > > | > > > > > > > > > | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 |
last = i + 1;
state = OF_XMLPARSER_TAG_OPENED;
}
break;
/* Tag was just opened */
case OF_XMLPARSER_TAG_OPENED:
switch (buf[i]) {
case '?':
last = i + 1;
state = OF_XMLPARSER_IN_PROLOG;
break;
case '/':
last = i + 1;
state = OF_XMLPARSER_IN_CLOSE_TAG_NAME;
break;
case '!':
last = i + 1;
state = OF_XMLPARSER_IN_CDATA_OR_COMMENT;
break;
default:
state = OF_XMLPARSER_IN_TAG_NAME;
i--;
break;
}
break;
/* Inside prolog */
case OF_XMLPARSER_IN_PROLOG:
last = i + 1;
if (buf[i] == '?')
state = OF_XMLPARSER_EXPECT_CLOSE;
break;
/* Inside a tag, no name yet */
case OF_XMLPARSER_IN_TAG_NAME:
if (buf[i] == ' ' || buf[i] == '\n' || buf[i] == '\r' ||
buf[i] == '>' || buf[i] == '/') {
const char *cache_c, *tmp;
size_t cache_len;
|
| ︙ | ︙ |
Modified tests/OFXMLParserTests.m from [e71bc53c5d] to [88d490bdfe].
| ︙ | ︙ | |||
302 303 304 305 306 307 308 |
return nil;
}
- (void)XMLParserTests
{
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
OFXMLParser *parser;
| | | 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 |
return nil;
}
- (void)XMLParserTests
{
OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init];
OFXMLParser *parser;
const char *str = "<?xml version='1.0'?><root>\n"
" <![CDATA[f<oo]]><bar/>\n"
" <foobar xmlns='urn:objfw:test:foobar'>\n"
" <qux xmlns:foo='urn:objfw:test:foo'>\n"
" <foo:bla foo:bla='bla' blafoo='foo'>\n"
" <blup foo:qux='asd' quxqux='test'/>\n"
" <bla:bla\r\rxmlns:bla=\"urn:objfw:test:bla\" qux='qux'\r\n"
" bla:foo='blafoo'/>\n"
|
| ︙ | ︙ |