Overview
Comment: | Add support for blocks to OFXMLParser. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
b5d7201385f33d70c9e0647f8fb207ff |
User & Date: | js on 2010-10-05 19:59:06 |
Other Links: | manifest | tags |
Context
2010-10-05
| ||
20:01 | Remove -[autorelease] from OFBlock. check-in: f78e4e4714 user: js tags: trunk | |
19:59 | Add support for blocks to OFXMLParser. check-in: b5d7201385 user: js tags: trunk | |
19:52 | Use ${LN_S} instead of ln -s. check-in: 4da2b3bcf0 user: js tags: trunk | |
Changes
Modified src/OFXMLParser.h from [1fa95b39f4] to [096a04c4bc].
︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 | #import "OFString.h" #import "OFXMLAttribute.h" @class OFXMLParser; @class OFArray; @class OFMutableArray; /** * \brief A protocol that needs to be implemented by delegates for OFXMLParser. */ @protocol OFXMLParserDelegate /** * This callback is called when the XML parser found the start of a new tag. * | > > > > > > > > > > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | #import "OFString.h" #import "OFXMLAttribute.h" @class OFXMLParser; @class OFArray; @class OFMutableArray; #ifdef OF_HAVE_BLOCKS typedef void (^of_xml_parser_element_start_block_t)(OFXMLParser *parser, OFString *name, OFString *prefix, OFString *namespace, OFArray *attrs); typedef void (^of_xml_parser_element_end_block_t)(OFXMLParser *parser, OFString *name, OFString *prefix, OFString *namespace); typedef void (^of_xml_parser_string_block_t)(OFXMLParser *parser, OFString *string); typedef OFString* (^of_xml_parser_unknown_entity_block_t)(OFXMLParser *parser, OFString *entity); #endif /** * \brief A protocol that needs to be implemented by delegates for OFXMLParser. */ @protocol OFXMLParserDelegate /** * This callback is called when the XML parser found the start of a new tag. * |
︙ | ︙ | |||
134 135 136 137 138 139 140 141 142 143 144 145 146 147 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 | OFString *prefix; OFMutableArray *namespaces; OFMutableArray *attrs; OFString *attrName; OFString *attrPrefix; char delim; OFMutableArray *previous; } #ifdef OF_HAVE_PROPERTIES @property (retain) id <OFXMLParserDelegate> delegate; #endif /** * \return A new, autoreleased OFXMLParser */ + parser; /** * \return The delegate that is used by the XML parser */ - (id <OFXMLParserDelegate>)delegate; /** * Sets the delegate the OFXMLParser should use. * * \param delegate The delegate to use */ - (void)setDelegate: (id <OFXMLParserDelegate>)delegate; /** * Parses a buffer with the specified size. * * \param buf The buffer to parse * \param size The size of the buffer */ - (void)parseBuffer: (const char*)buf withSize: (size_t)size; @end @interface OFObject (OFXMLParserDelegate) <OFXMLParserDelegate> @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 145 146 147 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 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 | OFString *prefix; OFMutableArray *namespaces; OFMutableArray *attrs; OFString *attrName; OFString *attrPrefix; char delim; OFMutableArray *previous; #ifdef OF_HAVE_BLOCKS of_xml_parser_element_start_block_t elementStartHandler; of_xml_parser_element_end_block_t elementEndHandler; of_xml_parser_string_block_t charactersHandler; of_xml_parser_string_block_t CDATAHandler; of_xml_parser_string_block_t commentHandler; of_xml_parser_unknown_entity_block_t unknownEntityHandler; #endif } #ifdef OF_HAVE_PROPERTIES @property (retain) id <OFXMLParserDelegate> delegate; # ifdef OF_HAVE_BLOCKS @property (copy) of_xml_parser_element_start_block_t elementStartHandler; @property (copy) of_xml_parser_element_end_block_t elementEndHandler; @property (copy) of_xml_parser_string_block_t charactersHandler; @property (copy) of_xml_parser_string_block_t CDATAHandler; @property (copy) of_xml_parser_string_block_t commentHandler; @property (copy) of_xml_parser_unknown_entity_block_t unknownEntityHandler; # endif #endif /** * \return A new, autoreleased OFXMLParser */ + parser; /** * \return The delegate that is used by the XML parser */ - (id <OFXMLParserDelegate>)delegate; /** * Sets the delegate the OFXMLParser should use. * * \param delegate The delegate to use */ - (void)setDelegate: (id <OFXMLParserDelegate>)delegate; #ifdef OF_HAVE_BLOCKS /** * \return The element start handler */ - (of_xml_parser_element_start_block_t)elementStartHandler; /** * Sets the element start handler. * * \param block An element start handler */ - (void)setElementStartHandler: (of_xml_parser_element_start_block_t)block; /** * \return The element end handler */ - (of_xml_parser_element_end_block_t)elementEndHandler; /** * Sets the element end handler. * * \param block An element end handler */ - (void)setElementEndHandler: (of_xml_parser_element_end_block_t)block; /** * \return The characters handler */ - (of_xml_parser_string_block_t)charactersHandler; /** * Sets the characters handler. * * \param block A characters handler */ - (void)setCharactersHandler: (of_xml_parser_string_block_t)block; /** * \return The CDATA handler */ - (of_xml_parser_string_block_t)CDATAHandler; /** * Sets the CDATA handler. * * \param block A CDATA handler */ - (void)setCDATAHandler: (of_xml_parser_string_block_t)block; /** * \return The comment handler */ - (of_xml_parser_string_block_t)commentHandler; /** * Sets the comment handler. * * \param block A comment handler */ - (void)setCommentHandler: (of_xml_parser_string_block_t)block; /** * \return The unknown entity handler */ - (of_xml_parser_unknown_entity_block_t)unknownEntityHandler; /** * Sets the unknown entity handler. * * \param block An unknown entity handler */ - (void)setUnknownEntityHandler: (of_xml_parser_unknown_entity_block_t)block; #endif /** * Parses a buffer with the specified size. * * \param buf The buffer to parse * \param size The size of the buffer */ - (void)parseBuffer: (const char*)buf withSize: (size_t)size; @end @interface OFObject (OFXMLParserDelegate) <OFXMLParserDelegate> @end |
Modified src/OFXMLParser.m from [f70ec8d4db] to [5826d56f73].
︙ | ︙ | |||
113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | [name release]; [prefix release]; [namespaces release]; [attrs release]; [attrName release]; [attrPrefix release]; [previous release]; [super dealloc]; } - (id <OFXMLParserDelegate>)delegate { return [[(id)delegate retain] autorelease]; } - (void)setDelegate: (id <OFXMLParserDelegate>)delegate_ { [(id)delegate_ retain]; [(id)delegate release]; delegate = delegate_; } - (void)parseBuffer: (const char*)buf withSize: (size_t)size { OFAutoreleasePool *pool; size_t i, last, len; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 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 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | [name release]; [prefix release]; [namespaces release]; [attrs release]; [attrName release]; [attrPrefix release]; [previous release]; #ifdef OF_HAVE_BLOCKS [elementStartHandler release]; [elementEndHandler release]; [charactersHandler release]; [CDATAHandler release]; [commentHandler release]; [unknownEntityHandler release]; #endif [super dealloc]; } - (id <OFXMLParserDelegate>)delegate { return [[(id)delegate retain] autorelease]; } - (void)setDelegate: (id <OFXMLParserDelegate>)delegate_ { [(id)delegate_ retain]; [(id)delegate release]; delegate = delegate_; } #ifdef OF_HAVE_BLOCKS - (of_xml_parser_element_start_block_t)elementStartHandler { of_xml_parser_element_start_block_t block = [elementStartHandler copy]; [OFAutoreleasePool addObject: block]; return block; } - (void)setElementStartHandler: (of_xml_parser_element_start_block_t)block { block = [block copy]; [elementStartHandler release]; elementStartHandler = block; } - (of_xml_parser_element_end_block_t)elementEndHandler { of_xml_parser_element_end_block_t block = [elementEndHandler copy]; [OFAutoreleasePool addObject: block]; return block; } - (void)setElementEndHandler: (of_xml_parser_element_end_block_t)block { block = [block copy]; [elementEndHandler release]; elementEndHandler = block; } - (of_xml_parser_string_block_t)charactersHandler { of_xml_parser_string_block_t block = [charactersHandler copy]; [OFAutoreleasePool addObject: block]; return block; } - (void)setCharactersHandler: (of_xml_parser_string_block_t)block { block = [block copy]; [charactersHandler release]; charactersHandler = block; } - (of_xml_parser_string_block_t)CDATAHandler { of_xml_parser_string_block_t block = [CDATAHandler copy]; [OFAutoreleasePool addObject: block]; return block; } - (void)setCDATAHandler: (of_xml_parser_string_block_t)block { block = [block copy]; [CDATAHandler release]; CDATAHandler = block; } - (of_xml_parser_string_block_t)commentHandler { of_xml_parser_string_block_t block = [commentHandler copy]; [OFAutoreleasePool addObject: block]; return block; } - (void)setCommentHandler: (of_xml_parser_string_block_t)block { block = [block copy]; [commentHandler release]; commentHandler = block; } - (of_xml_parser_unknown_entity_block_t)unknownEntityHandler { of_xml_parser_unknown_entity_block_t block; block = [unknownEntityHandler copy]; [OFAutoreleasePool addObject: block]; return block; } - (void)setUnknownEntityHandler: (of_xml_parser_unknown_entity_block_t)block { block = [block copy]; [unknownEntityHandler release]; unknownEntityHandler = block; } #endif - (void)parseBuffer: (const char*)buf withSize: (size_t)size { OFAutoreleasePool *pool; size_t i, last, len; |
︙ | ︙ | |||
154 155 156 157 158 159 160 | length: len]; if ([cache cStringLength] > 0) { OFString *str; pool = [[OFAutoreleasePool alloc] init]; str = transform_string(cache, self); | > > > > > > | | > | 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | length: len]; if ([cache cStringLength] > 0) { OFString *str; pool = [[OFAutoreleasePool alloc] init]; str = transform_string(cache, self); #ifdef OF_HAVE_BLOCKS if (charactersHandler != nil) charactersHandler(self, str); else #endif [delegate parser: self foundCharacters: str]; [pool release]; } [cache setToCString: ""]; last = i + 1; state = OF_XMLPARSER_TAG_OPENED; |
︙ | ︙ | |||
238 239 240 241 242 243 244 | @throw [OFUnboundNamespaceException newWithClass: isa prefix: prefix]; pool = [[OFAutoreleasePool alloc] init]; | > > > > > > | | | | | | > > > > > > | | | | | | 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 | @throw [OFUnboundNamespaceException newWithClass: isa prefix: prefix]; pool = [[OFAutoreleasePool alloc] init]; #ifdef OF_HAVE_BLOCKS if (elementStartHandler != nil) elementStartHandler(self, name, prefix, ns, nil); else #endif [delegate parser: self didStartElement: name withPrefix: prefix namespace: ns attributes: nil]; if (buf[i] == '/') { #ifdef OF_HAVE_BLOCKS if (elementEndHandler != nil) elementEndHandler(self, name, prefix, ns); else #endif [delegate parser: self didEndElement: name withPrefix: prefix namespace: ns]; } else [previous addObject: [[cache copy] autorelease]]; [pool release]; [name release]; [prefix release]; |
︙ | ︙ | |||
322 323 324 325 326 327 328 | if (prefix != nil && ns == nil) @throw [OFUnboundNamespaceException newWithClass: isa prefix: prefix]; pool = [[OFAutoreleasePool alloc] init]; | > > > > > > | | | | | 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 | if (prefix != nil && ns == nil) @throw [OFUnboundNamespaceException newWithClass: isa prefix: prefix]; pool = [[OFAutoreleasePool alloc] init]; #ifdef OF_HAVE_BLOCKS if (elementEndHandler != nil) elementEndHandler(self, name, prefix, ns); else #endif [delegate parser: self didEndElement: name withPrefix: prefix namespace: ns]; [pool release]; [namespaces removeNObjects: 1]; [name release]; [prefix release]; name = prefix = nil; |
︙ | ︙ | |||
361 362 363 364 365 366 367 | for (j = 0; j < attrs_cnt; j++) resolve_attr_namespace(attrs_c[j], prefix, ns, namespaces, isa); pool = [[OFAutoreleasePool alloc] init]; | > > > > > > | | | | | > > > > > > | | | | | 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 | for (j = 0; j < attrs_cnt; j++) resolve_attr_namespace(attrs_c[j], prefix, ns, namespaces, isa); pool = [[OFAutoreleasePool alloc] init]; #ifdef OF_HAVE_BLOCKS if (elementStartHandler != nil) elementStartHandler(self, name, prefix, ns, attrs); else #endif [delegate parser: self didStartElement: name withPrefix: prefix namespace: ns attributes: attrs]; if (buf[i] == '/') { #ifdef OF_HAVE_BLOCKS if (elementEndHandler != nil) elementEndHandler(self, name, prefix, ns); else #endif [delegate parser: self didEndElement: name withPrefix: prefix namespace: ns]; [namespaces removeNObjects: 1]; } else if (prefix != nil) { OFString *str = [OFString stringWithFormat: @"%s:%s", [prefix cString], [name cString]]; [previous addObject: str]; |
︙ | ︙ | |||
601 602 603 604 605 606 607 | appendCStringWithoutUTF8Checking: buf + last length: i - last]; cdata = [[cache mutableCopy] autorelease]; len = [cdata length]; [cdata removeCharactersFromIndex: len - 2 toIndex: len]; | > > > > > > | | > | 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 | appendCStringWithoutUTF8Checking: buf + last length: i - last]; cdata = [[cache mutableCopy] autorelease]; len = [cdata length]; [cdata removeCharactersFromIndex: len - 2 toIndex: len]; #ifdef OF_HAVE_BLOCKS if (CDATAHandler != nil) CDATAHandler(self, cdata); else #endif [delegate parser: self foundCDATA: cdata]; [pool release]; [cache setToCString: ""]; last = i + 1; state = OF_XMLPARSER_OUTSIDE_TAG; } else if (buf[i] != ']') |
︙ | ︙ | |||
644 645 646 647 648 649 650 | appendCStringWithoutUTF8Checking: buf + last length: i - last]; comment = [[cache mutableCopy] autorelease]; len = [comment length]; [comment removeCharactersFromIndex: len - 2 toIndex: len]; | > > > > > > | | > | 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 | appendCStringWithoutUTF8Checking: buf + last length: i - last]; comment = [[cache mutableCopy] autorelease]; len = [comment length]; [comment removeCharactersFromIndex: len - 2 toIndex: len]; #ifdef OF_HAVE_BLOCKS if (commentHandler != nil) commentHandler(self, comment); else #endif [delegate parser: self foundComment: comment]; [pool release]; [cache setToCString: ""]; last = i + 1; state = OF_XMLPARSER_OUTSIDE_TAG; } else |
︙ | ︙ | |||
670 671 672 673 674 675 676 677 678 679 680 681 682 683 | [cache appendCStringWithoutUTF8Checking: buf + last length: len]; } - (OFString*)string: (OFString*)string containsUnknownEntityNamed: (OFString*)entity { return [delegate parser: self foundUnknownEntityNamed: entity]; } @end @implementation OFObject (OFXMLParserDelegate) - (void)parser: (OFXMLParser*)parser | > > > > > | 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 | [cache appendCStringWithoutUTF8Checking: buf + last length: len]; } - (OFString*)string: (OFString*)string containsUnknownEntityNamed: (OFString*)entity { #ifdef OF_HAVE_BLOCKS if (unknownEntityHandler != nil) return unknownEntityHandler(self, entity); #endif return [delegate parser: self foundUnknownEntityNamed: entity]; } @end @implementation OFObject (OFXMLParserDelegate) - (void)parser: (OFXMLParser*)parser |
︙ | ︙ |