Overview
Comment: | Support for namespaces in OFXMLElement and OFXMLParser. HUGE diff! |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
e8c8d5a894d1837d8044971074fda43b |
User & Date: | js on 2010-06-06 20:04:25 |
Other Links: | manifest | tags |
Context
2010-06-06
| ||
22:08 | Correctly handle section 2.10 and 2.11 of XML 1.0. check-in: bbbb105f5f user: js tags: trunk | |
20:04 | Support for namespaces in OFXMLElement and OFXMLParser. HUGE diff! check-in: e8c8d5a894 user: js tags: trunk | |
2010-06-01
| ||
18:00 | Fix a very nasty typo in OFMutableDictionary. check-in: 3bccfadcc1 user: js tags: trunk | |
Changes
Modified src/OFExceptions.h from [51068b190a] to [258dd6b4db].
︙ | ︙ | |||
1148 1149 1150 1151 1152 1153 1154 | @end /** * \brief An exception indicating that the hash has already been calculated. */ @interface OFHashAlreadyCalculatedException: OFException {} @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 | @end /** * \brief An exception indicating that the hash has already been calculated. */ @interface OFHashAlreadyCalculatedException: OFException {} @end /** * \brief An exception indicating an attempt to use an unbound namespace. */ @interface OFUnboundNamespaceException: OFException { OFString *namespace; OFString *prefix; } #ifdef OF_HAVE_PROPERTIES @property (readonly, nonatomic) OFString *namespace; @property (readonly, nonatomic) OFString *prefix; #endif /** * \param class_ The class of the object which caused the exception * \param namespace The namespace which is unbound * \return A new unbound namespace exception */ + newWithClass: (Class)class_ namespace: (OFString*)namespace; /** * \param class_ The class of the object which caused the exception * \param prefix The prefix which is unbound * \return A new unbound namespace exception */ + newWithClass: (Class)class_ prefix: (OFString*)prefix; /** * Initializes an already allocated unbound namespace failed exception * * \param class_ The class of the object which caused the exception * \param namespace The namespace which is unbound * \return An initialized unbound namespace exception */ - initWithClass: (Class)class_ namespace: (OFString*)namespace; /** * Initializes an already allocated unbound namespace failed exception * * \param class_ The class of the object which caused the exception * \param prefix The prefix which is unbound * \return An initialized unbound namespace exception */ - initWithClass: (Class)class_ prefix: (OFString*)prefix; /** * \return The unbound namespace */ - (OFString*)namespace; /** * \return The unbound prefix */ - (OFString*)prefix; @end |
Modified src/OFExceptions.m from [a94e12da30] to [a38cc28a3c].
︙ | ︙ | |||
1508 1509 1510 1511 1512 1513 1514 | string = [[OFString alloc] initWithFormat: @"The hash has already been calculated in class %s and thus no new " @"data can be added", [inClass className]]; return string; } @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 | string = [[OFString alloc] initWithFormat: @"The hash has already been calculated in class %s and thus no new " @"data can be added", [inClass className]]; return string; } @end @implementation OFUnboundNamespaceException + newWithClass: (Class)class_ namespace: (OFString*)namespace { return [[self alloc] initWithClass: class_ namespace: namespace]; } + newWithClass: (Class)class_ prefix: (OFString*)prefix { return [[self alloc] initWithClass: class_ prefix: prefix]; } - initWithClass: (Class)class_ { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - initWithClass: (Class)class_ namespace: (OFString*)namespace_ { self = [super initWithClass: class_]; namespace = [namespace_ copy]; return self; } - initWithClass: (Class)class_ prefix: (OFString*)prefix_ { self = [super initWithClass: class_]; prefix = [prefix_ copy]; return self; } - (void)dealloc { [namespace release]; [prefix release]; [super dealloc]; } - (OFString*)string { if (string != nil) return string; if (namespace != nil) string = [[OFString alloc] initWithFormat: @"The namespace %s is not bound in class %s", [inClass className]]; else if (prefix != nil) string = [[OFString alloc] initWithFormat: @"The prefix %s is not bound to any namespace in %s", [inClass className]]; return string; } - (OFString*)namespace { return namespace; } - (OFString*)prefix { return prefix; } @end |
Modified src/OFXMLElement.h from [965662754c] to [a44393b6ce].
︙ | ︙ | |||
8 9 10 11 12 13 14 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" #import "OFString.h" | | | < < < < < < < < < < < > > > | | > > > > > > > > > > > > > > > > > > > > | > | | > > > > > > > > > > > > > > > > > > > > > > > > > > | 8 9 10 11 12 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 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 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 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #import "OFObject.h" #import "OFString.h" @class OFMutableArray; @class OFMutableDictionary; extern int _OFXMLElement_reference; /** * \brief A representation of an attribute of an XML element as an object. */ @interface OFXMLAttribute: OFObject { OFString *name; OFString *namespace; OFString *stringValue; } #ifdef OF_HAVE_PROPERTIES @property (readonly, retain) OFString *name; @property (readonly, retain) OFString *namespace; @property (readonly, retain) OFString *stringValue; #endif /** * \param name The name of the attribute * \param ns The namespace of the attribute * \param value The string value of the attribute * \return A new autoreleased OFXMLAttribute with the specified parameters */ + attributeWithName: (OFString*)name namespace: (OFString*)ns stringValue: (OFString*)value; /** * Initializes an already allocated OFXMLAttribute. * * \param name The name of the attribute * \param ns The namespace of the attribute * \param value The string value of the attribute * \return An initialized OFXMLAttribute with the specified parameters */ - initWithName: (OFString*)name namespace: (OFString*)ns stringValue: (OFString*)value; /** * \return The name of the attribute as an autoreleased OFString */ - (OFString*)name; /** * \return The namespace of the attribute as an autoreleased OFString */ - (OFString*)namespace; /** * \return The string value of the attribute as an autoreleased OFString */ - (OFString*)stringValue; @end /** * \brief A representation of an XML element as an object. * * The OFXMLElement represents an XML element as an object which can be * modified and converted back to XML again. */ @interface OFXMLElement: OFObject { OFString *name; OFString *namespace; OFString *defaultNamespace; OFMutableArray *attributes; OFString *stringValue; OFMutableDictionary *namespaces; OFMutableArray *children; } /** * \param name The name for the element * \return A new autoreleased OFXMLElement with the specified element name */ + elementWithName: (OFString*)name; /** * \param name The name for the element * \param stringval The value for the element * \return A new autoreleased OFXMLElement with the specified element name and * value */ + elementWithName: (OFString*)name stringValue: (OFString*)stringval; /** * \param name The name for the element * \param ns The namespace for the element * \return A new autoreleased OFXMLElement with the specified element name and * namespace */ + elementWithName: (OFString*)name namespace: (OFString*)ns; /** * \param name The name for the element * \param ns The namespace for the element * \param stringval The value for the element * \return A new autoreleased OFXMLElement with the specified element name, * namespace and value */ + elementWithName: (OFString*)name namespace: (OFString*)ns stringValue: (OFString*)stringval; /** * Initializes an already allocated OFXMLElement with the specified element * name. * * \param name The name for the element * \return An initialized OFXMLElement with the specified element name */ - initWithName: (OFString*)name; /** * Initializes an already allocated OFXMLElement with the specified element * name and value. * * \param name The name for the element * \param stringval The value for the element * \return An initialized OFXMLElement with the specified element name and * value */ - initWithName: (OFString*)name stringValue: (OFString*)stringval; /** * Initializes an already allocated OFXMLElement with the specified element * name and namespace. * * \param name The name for the element * \param ns The namespace for the element * \return An initialized OFXMLElement with the specified element name and * namespace */ - initWithName: (OFString*)name namespace: (OFString*)ns; /** * Initializes an already allocated OFXMLElement with the specified element * name, namespace and value. * * \param name The name for the element * \param ns The namespace for the element * \param stringval The value for the element * \return An initialized OFXMLElement with the specified element name, * namespace and value */ - initWithName: (OFString*)name namespace: (OFString*)ns stringValue: (OFString*)stringval; /** * \return A new autoreleased OFString representing the OFXMLElement as an * XML string */ - (OFString*)string; /** |
︙ | ︙ | |||
149 150 151 152 153 154 155 156 157 158 159 160 161 162 | * * \param name The name of the attribute * \param value The value of the attribute */ - (void)addAttributeWithName: (OFString*)name stringValue: (OFString*)value; /** * Adds a child to the OFXMLElement. * * \param child Another OFXMLElement which is added as a child */ - (void)addChild: (OFXMLElement*)child; @end | > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | * * \param name The name of the attribute * \param value The value of the attribute */ - (void)addAttributeWithName: (OFString*)name stringValue: (OFString*)value; /** * Adds the specified attribute with the specified namespace and value. * * \param name The name of the attribute * \param ns The namespace of the attribute * \param value The value of the attribute */ - (void)addAttributeWithName: (OFString*)name namespace: (OFString*)ns stringValue: (OFString*)value; /** * Sets a prefix for a namespace. * * \param prefix The prefix for the namespace * \param ns The namespace for which the prefix is set */ - (void)setPrefix: (OFString*)prefix forNamespace: (OFString*)ns; /** * Sets the default namespace for the element. * * \param ns The default namespace for the element */ - (void)setDefaultNamespace: (OFString*)ns; /** * Adds a child to the OFXMLElement. * * \param child Another OFXMLElement which is added as a child */ - (void)addChild: (OFXMLElement*)child; @end |
︙ | ︙ |
Modified src/OFXMLElement.m from [d6b729bcd1] to [62e141f922].
︙ | ︙ | |||
14 15 16 17 18 19 20 21 22 23 24 25 26 27 | #include <assert.h> #include <stdlib.h> #include <string.h> #import "OFXMLElement.h" #import "OFString.h" #import "OFArray.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" int _OFXMLElement_reference; @implementation OFXMLAttribute + attributeWithName: (OFString*)name | > < < < < < < < < < < | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | #include <assert.h> #include <stdlib.h> #include <string.h> #import "OFXMLElement.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" int _OFXMLElement_reference; @implementation OFXMLAttribute + attributeWithName: (OFString*)name namespace: (OFString*)ns stringValue: (OFString*)value { return [[[self alloc] initWithName: name namespace: ns stringValue: value] autorelease]; } - initWithName: (OFString*)name_ namespace: (OFString*)ns stringValue: (OFString*)value { self = [super init]; name = [name_ copy]; namespace = [ns copy]; stringValue = [value copy]; return self; } - (void)dealloc { [name release]; [namespace release]; [stringValue release]; [super dealloc]; } - (OFString*)name { return [[name copy] autorelease]; } - (OFString*)namespace { return [[namespace copy] autorelease]; } - (OFString*)stringValue { |
︙ | ︙ | |||
89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | + elementWithName: (OFString*)name stringValue: (OFString*)stringval { return [[[self alloc] initWithName: name stringValue: stringval] autorelease]; } - init { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - initWithName: (OFString*)name_ { | > > > > > > > > > > > > > > > > > > > > | > > | > > > > | > > | | > > > > > > > > | > | > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > | | > < > > > > > > > > > > > | > > > > > > > > > | | > > > > > > > > > > > > > > > > > > > > > > > > > < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 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 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 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 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 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 | + elementWithName: (OFString*)name stringValue: (OFString*)stringval { return [[[self alloc] initWithName: name stringValue: stringval] autorelease]; } + elementWithName: (OFString*)name namespace: (OFString*)ns { return [[[self alloc] initWithName: name namespace: ns] autorelease]; } + elementWithName: (OFString*)name namespace: (OFString*)ns stringValue: (OFString*)stringval { return [[[self alloc] initWithName: name namespace: ns stringValue: stringval] autorelease]; } - init { @throw [OFNotImplementedException newWithClass: isa selector: _cmd]; } - initWithName: (OFString*)name_ { return [self initWithName: name_ namespace: nil stringValue: nil]; } - initWithName: (OFString*)name_ stringValue: (OFString*)stringval { return [self initWithName: name_ namespace: nil stringValue: stringval]; } - initWithName: (OFString*)name_ namespace: (OFString*)ns { return [self initWithName: name_ namespace: ns stringValue: nil]; } - initWithName: (OFString*)name_ namespace: (OFString*)ns stringValue: (OFString*)stringval { self = [super init]; name = [name_ copy]; namespace = [ns copy]; stringValue = [stringval copy]; namespaces = [[OFMutableDictionary alloc] initWithKeysAndObjects: @"http://www.w3.org/XML/1998/namespace", @"xml", @"http://www.w3.org/2000/xmlns/", @"xmlns", nil]; return self; } - (OFString*)_stringWithParentNamespaces: (OFDictionary*)parent_namespaces parentDefaultNamespace: (OFString*)parent_default_ns { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init], *pool2; char *str_c; size_t len, i, j, attrs_count; OFString *prefix = nil; OFXMLAttribute **attrs_carray; OFString *ret, *tmp; OFMutableDictionary *all_namespaces; OFString *def_ns; def_ns = (defaultNamespace != nil ? defaultNamespace : parent_default_ns); if (parent_namespaces != nil) { OFEnumerator *key_enum = [namespaces keyEnumerator]; OFEnumerator *obj_enum = [namespaces objectEnumerator]; id key, obj; all_namespaces = [[parent_namespaces mutableCopy] autorelease]; while ((key = [key_enum nextObject]) != nil && (obj = [obj_enum nextObject]) != nil) [all_namespaces setObject: obj forKey: key]; } else all_namespaces = namespaces; i = 0; len = [name cStringLength] + 3; str_c = [self allocMemoryWithSize: len]; /* Start of tag */ str_c[i++] = '<'; if ((namespace == nil && def_ns != nil) || (namespace != nil && def_ns == nil) || (namespace != nil && ![namespace isEqual: def_ns])) { if ((prefix = [all_namespaces objectForKey: (namespace != nil ? namespace : @"")]) == nil) @throw [OFUnboundNamespaceException newWithClass: isa namespace: namespace]; len += [prefix cStringLength] + 1; @try { str_c = [self resizeMemory: str_c toSize: len]; } @catch (OFException *e) { [self freeMemory: str_c]; @throw e; } memcpy(str_c + i, [prefix cString], [prefix cStringLength]); i += [prefix cStringLength]; str_c[i++] = ':'; } memcpy(str_c + i, [name cString], [name cStringLength]); i += [name cStringLength]; /* Attributes */ attrs_carray = [attributes cArray]; attrs_count = [attributes count]; pool2 = [[OFAutoreleasePool alloc] init]; for (j = 0; j < attrs_count; j++) { OFString *attr_name = [attrs_carray[j] name]; OFString *attr_prefix = nil; tmp = [[attrs_carray[j] stringValue] stringByXMLEscaping]; if (([attrs_carray[j] namespace] == nil && namespace != nil) || ([attrs_carray[j] namespace] != nil && namespace == nil) || ([attrs_carray[j] namespace] != nil && ![[attrs_carray[j] namespace] isEqual: namespace])) if ((attr_prefix = [all_namespaces objectForKey: [attrs_carray[j] namespace]]) == nil) @throw [OFUnboundNamespaceException newWithClass: isa namespace: [attrs_carray[j] namespace]]; len += [attr_name cStringLength] + (attr_prefix != nil ? [attr_prefix cStringLength] + 1 : 0) + [tmp cStringLength] + 4; @try { str_c = [self resizeMemory: str_c toSize: len]; } @catch (OFException *e) { [self freeMemory: str_c]; @throw e; } str_c[i++] = ' '; if (attr_prefix != nil) { memcpy(str_c + i, [attr_prefix cString], [attr_prefix cStringLength]); i += [attr_prefix cStringLength]; str_c[i++] = ':'; } memcpy(str_c + i, [attr_name cString], [attr_name cStringLength]); i += [attr_name cStringLength]; str_c[i++] = '='; str_c[i++] = '\''; memcpy(str_c + i, [tmp cString], [tmp cStringLength]); i += [tmp cStringLength]; str_c[i++] = '\''; [pool2 releaseObjects]; } /* Childen */ if (stringValue != nil || children != nil) { if (stringValue != nil) tmp = [stringValue stringByXMLEscaping]; else if (children != nil) { OFXMLElement **children_carray = [children cArray]; size_t children_count = [children count]; IMP append; tmp = [OFMutableString string]; append = [tmp methodForSelector: @selector(appendCStringWithoutUTF8Checking:)]; for (j = 0; j < children_count; j++) append(tmp, @selector( appendCStringWithoutUTF8Checking:), [[children_carray[j] _stringWithParentNamespaces: all_namespaces parentDefaultNamespace: defaultNamespace] cString]); } len += [tmp cStringLength] + [name cStringLength] + 2; @try { str_c = [self resizeMemory: str_c toSize: len]; } @catch (OFException *e) { [self freeMemory: str_c]; @throw e; } str_c[i++] = '>'; memcpy(str_c + i, [tmp cString], [tmp cStringLength]); i += [tmp cStringLength]; str_c[i++] = '<'; str_c[i++] = '/'; if (prefix != nil) { len += [prefix cStringLength] + 1; @try { str_c = [self resizeMemory: str_c toSize: len]; } @catch (OFException *e) { [self freeMemory: str_c]; @throw e; } memcpy(str_c + i, [prefix cString], [prefix cStringLength]); i += [prefix cStringLength]; str_c[i++] = ':'; } memcpy(str_c + i, [name cString], [name cStringLength]); i += [name cStringLength]; } else str_c[i++] = '/'; str_c[i++] = '>'; assert(i == len); [pool release]; @try { ret = [OFString stringWithCString: str_c length: len]; } @finally { [self freeMemory: str_c]; } return ret; } - (OFString*)string { return [self _stringWithParentNamespaces: nil parentDefaultNamespace: nil]; } - (void)addAttribute: (OFXMLAttribute*)attr { if (attributes == nil) attributes = [[OFMutableArray alloc] init]; /* FIXME: Prevent having it twice! */ [attributes addObject: attr]; } - (void)addAttributeWithName: (OFString*)name_ stringValue: (OFString*)value { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; [self addAttribute: [OFXMLAttribute attributeWithName: name_ namespace: nil stringValue: value]]; [pool release]; } - (void)addAttributeWithName: (OFString*)name_ namespace: (OFString*)ns stringValue: (OFString*)value { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; [self addAttribute: [OFXMLAttribute attributeWithName: name_ namespace: ns stringValue: value]]; [pool release]; } /* TODO: Replace attribute */ /* TODO: Remove attribute */ - (void)setPrefix: (OFString*)prefix forNamespace: (OFString*)ns { if (prefix == nil || [prefix isEqual: @""]) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; if (ns == nil) ns = @""; [namespaces setObject: prefix forKey: ns]; } - (OFString*)defaultNamespace { return [[defaultNamespace retain] autorelease]; } - (void)setDefaultNamespace: (OFString*)ns { OFString *old = defaultNamespace; defaultNamespace = [ns copy]; [old release]; } - (void)addChild: (OFXMLElement*)child { if (stringValue != nil) @throw [OFInvalidArgumentException newWithClass: isa selector: _cmd]; if (children == nil) children = [[OFMutableArray alloc] init]; [children addObject: child]; } - (void)dealloc { [name release]; [namespace release]; [attributes release]; [stringValue release]; [namespaces release]; [children release]; [super dealloc]; } @end @implementation OFString (OFXMLEscaping) |
︙ | ︙ |
Modified src/OFXMLParser.h from [608f055e14] to [c146f53264].
︙ | ︙ | |||
123 124 125 126 127 128 129 | OF_XMLPARSER_IN_COMMENT_2, OF_XMLPARSER_IN_COMMENT_3, OF_XMLPARSER_IN_COMMENT_4 } state; OFMutableString *cache; OFString *name; OFString *prefix; | | > > > > | 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 | OF_XMLPARSER_IN_COMMENT_2, OF_XMLPARSER_IN_COMMENT_3, OF_XMLPARSER_IN_COMMENT_4 } state; OFMutableString *cache; OFString *name; OFString *prefix; OFMutableArray *namespaces; OFMutableArray *attrs; OFString *attrName; OFString *attrPrefix; char delim; OFMutableArray *previous; } #ifdef OF_HAVE_PROPERTIES @property (retain) OFObject <OFXMLParserDelegate> *delegate; #endif /** * \return A new, autoreleased OFXMLParser */ + xmlParser; /** |
︙ | ︙ |
Modified src/OFXMLParser.m from [cd6f6b17e5] to [bab72d15ac].
︙ | ︙ | |||
8 9 10 11 12 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 38 39 40 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #include "config.h" #include <string.h> #import "OFXMLParser.h" #import "OFString.h" #import "OFArray.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #import "macros.h" int _OFXMLParser_reference; static OF_INLINE OFString* transform_string(OFMutableString *cache, OFObject <OFXMLUnescapingDelegate> *handler) { /* TODO: Support for xml:space */ [cache removeLeadingAndTrailingWhitespaces]; return [cache stringByXMLUnescapingWithHandler: handler]; } static OF_INLINE OFString* parse_numeric_entity(const char *entity, size_t length) { of_unichar_t c; size_t i; char buf[5]; | > > > > > > > > > > > > > > > > > > > > > | 8 9 10 11 12 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 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | * Q Public License 1.0, which can be found in the file LICENSE included in * the packaging of this file. */ #include "config.h" #include <string.h> #include <unistd.h> #import "OFXMLParser.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFAutoreleasePool.h" #import "OFExceptions.h" #import "macros.h" int _OFXMLParser_reference; static OF_INLINE OFString* transform_string(OFMutableString *cache, OFObject <OFXMLUnescapingDelegate> *handler) { /* TODO: Support for xml:space */ [cache removeLeadingAndTrailingWhitespaces]; return [cache stringByXMLUnescapingWithHandler: handler]; } static OF_INLINE OFString* namespace_for_prefix(OFString *prefix, OFArray *namespaces) { OFDictionary **carray = [namespaces cArray]; ssize_t i; if (prefix == nil) prefix = @""; for (i = [namespaces count] - 1; i >= 0; i--) { OFString *tmp; if ((tmp = [carray[i] objectForKey: prefix]) != nil) return tmp; } return nil; } static OF_INLINE OFString* parse_numeric_entity(const char *entity, size_t length) { of_unichar_t c; size_t i; char buf[5]; |
︙ | ︙ | |||
87 88 89 90 91 92 93 94 95 96 | } - init { self = [super init]; @try { cache = [[OFMutableString alloc] init]; previous = [[OFMutableArray alloc] init]; } @catch (OFException *e) { | > > > > > > > > > > > < | | 108 109 110 111 112 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 | } - init { self = [super init]; @try { OFAutoreleasePool *pool; OFMutableDictionary *dict; cache = [[OFMutableString alloc] init]; previous = [[OFMutableArray alloc] init]; namespaces = [[OFMutableArray alloc] init]; pool = [[OFAutoreleasePool alloc] init]; dict = [OFMutableDictionary dictionaryWithKeysAndObjects: @"xml", @"http://www.w3.org/XML/1998/namespace", @"xmlns", @"http://www.w3.org/2000/xmlns/", nil]; [namespaces addObject: dict]; [pool release]; } @catch (OFException *e) { [self dealloc]; @throw e; } return self; } - (void)dealloc { [delegate release]; [cache release]; [name release]; [prefix release]; [namespaces release]; [attrs release]; [attrName release]; [attrPrefix release]; [previous release]; [super dealloc]; } |
︙ | ︙ | |||
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 | length: tmp - cache_c]; } else { name = [cache copy]; prefix = nil; } if (buf[i] == '>' || buf[i] == '/') { pool = [[OFAutoreleasePool alloc] init]; [delegate xmlParser: self didStartTagWithName: name prefix: prefix namespace: ns attributes: nil]; if (buf[i] == '/') [delegate xmlParser: self didEndTagWithName: name prefix: prefix namespace: ns]; else [previous addObject: [[cache copy] autorelease]]; [pool release]; [name release]; [prefix release]; | > > > > > > > > > > < | > > > > > > > > | 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 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | length: tmp - cache_c]; } else { name = [cache copy]; prefix = nil; } if (buf[i] == '>' || buf[i] == '/') { OFString *ns; pool = [[OFAutoreleasePool alloc] init]; ns = namespace_for_prefix(prefix, namespaces); if (prefix != nil && ns == nil) @throw [OFUnboundNamespaceException newWithClass: isa prefix: prefix]; [delegate xmlParser: self didStartTagWithName: name prefix: prefix namespace: ns attributes: nil]; if (buf[i] == '/') [delegate xmlParser: self didEndTagWithName: name prefix: prefix namespace: ns]; else [previous addObject: [[cache copy] autorelease]]; [pool release]; [name release]; [prefix release]; name = prefix = nil; state = (buf[i] == '/' ? OF_XMLPARSER_EXPECT_CLOSE : OF_XMLPARSER_OUTSIDE_TAG); } else state = OF_XMLPARSER_IN_TAG; if (buf[i] != '/') { pool = [[OFAutoreleasePool alloc] init]; [namespaces addObject: [OFMutableDictionary dictionary]]; [pool release]; } [cache setToCString: ""]; last = i + 1; } break; /* Inside a close tag, no name yet */ case OF_XMLPARSER_IN_CLOSE_TAG_NAME: if (buf[i] == ' ' || buf[i] == '\n' || buf[i] == '\r' || buf[i] == '>') { const char *cache_c, *tmp; size_t cache_len; OFString *ns; len = i - last; if (len > 0) [cache appendCString: buf + last withLength: len]; cache_c = [cache cString]; cache_len = [cache cStringLength]; |
︙ | ︙ | |||
277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 | newWithClass: isa]; [previous removeNObjects: 1]; [cache setToCString: ""]; pool = [[OFAutoreleasePool alloc] init]; [delegate xmlParser: self didEndTagWithName: name prefix: prefix namespace: ns]; [pool release]; [name release]; [prefix release]; | > > > > > > > < | | < | | > > > > > > > > | > | < | | 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 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 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 | newWithClass: isa]; [previous removeNObjects: 1]; [cache setToCString: ""]; pool = [[OFAutoreleasePool alloc] init]; ns = namespace_for_prefix(prefix, namespaces); if (prefix != nil && ns == nil) @throw [OFUnboundNamespaceException newWithClass: isa prefix: prefix]; [namespaces removeNObjects: 1]; [delegate xmlParser: self didEndTagWithName: name prefix: prefix namespace: ns]; [pool release]; [name release]; [prefix release]; name = prefix = nil; last = i + 1; state = (buf[i] == '>' ? OF_XMLPARSER_OUTSIDE_TAG : OF_XMLPARSER_EXPECT_SPACE_OR_CLOSE); } break; /* Inside a tag, name found */ case OF_XMLPARSER_IN_TAG: if (buf[i] == '>' || buf[i] == '/') { OFString *ns; pool = [[OFAutoreleasePool alloc] init]; ns = namespace_for_prefix(prefix, namespaces); if (prefix != nil && ns == nil) @throw [OFUnboundNamespaceException newWithClass: isa prefix: prefix]; [delegate xmlParser: self didStartTagWithName: name prefix: prefix namespace: ns attributes: attrs]; if (buf[i] == '/') { [delegate xmlParser: self didEndTagWithName: name prefix: prefix namespace: ns]; [namespaces removeNObjects: 1]; } else if (prefix != nil) { OFString *str = [OFString stringWithFormat: @"%s:%s", [prefix cString], [name cString]]; [previous addObject: str]; } else [previous addObject: name]; [pool release]; [name release]; [prefix release]; [attrs release]; name = prefix = nil; attrs = nil; last = i + 1; state = (buf[i] == '/' ? OF_XMLPARSER_EXPECT_CLOSE : OF_XMLPARSER_OUTSIDE_TAG); } else if (buf[i] != ' ' && buf[i] != '\n' && |
︙ | ︙ | |||
392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 | last = i + 1; state = OF_XMLPARSER_IN_ATTR_VALUE; break; /* Looking for attribute value */ case OF_XMLPARSER_IN_ATTR_VALUE: if (buf[i] == delim) { OFString *attr_val; len = i - last; if (len > 0) [cache appendCString: buf + last withLength: len]; if (attrs == nil) attrs = [[OFMutableArray alloc] init]; | > > > > > > > > > > > > > > > > > > > > < < < < | > | 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 | last = i + 1; state = OF_XMLPARSER_IN_ATTR_VALUE; break; /* Looking for attribute value */ case OF_XMLPARSER_IN_ATTR_VALUE: if (buf[i] == delim) { OFString *attr_ns; OFString *attr_val; len = i - last; if (len > 0) [cache appendCString: buf + last withLength: len]; pool = [[OFAutoreleasePool alloc] init]; attr_ns = namespace_for_prefix( (attrPrefix != nil ? attrPrefix : prefix), namespaces); attr_val = [cache stringByXMLUnescapingWithHandler: self]; if (attrPrefix == nil && [attrName isEqual: @"xmlns"]) { [[namespaces lastObject] setObject: attr_val forKey: @""]; attr_ns = nil; } if ([attrPrefix isEqual: @"xmlns"]) [[namespaces lastObject] setObject: attr_val forKey: attrName]; if (attrs == nil) attrs = [[OFMutableArray alloc] init]; [attrs addObject: [OFXMLAttribute attributeWithName: attrName namespace: attr_ns stringValue: attr_val]]; [pool release]; [cache setToCString: ""]; [attrName release]; [attrPrefix release]; attrName = attrPrefix = nil; |
︙ | ︙ |
Modified tests/OFXMLElementTests.m from [a0a019906c] to [0b94bf1d4a].
︙ | ︙ | |||
22 23 24 25 26 27 28 | static OFString *module = @"OFXMLElement"; @implementation TestsAppDelegate (OFXMLElementTests) - (void)XMLElementTests { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > | 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | static OFString *module = @"OFXMLElement"; @implementation TestsAppDelegate (OFXMLElementTests) - (void)XMLElementTests { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFXMLElement *elem[4]; TEST(@"+[elementWithName:]", (elem[0] = [OFXMLElement elementWithName: @"foo"]) && [[elem[0] string] isEqual: @"<foo/>"]) TEST(@"+[elementWithName:stringValue:]", (elem[1] = [OFXMLElement elementWithName: @"foo" stringValue: @"b&ar"]) && [[elem[1] string] isEqual: @"<foo>b&ar</foo>"]) TEST(@"+[elementWithName:namespace:]", (elem[2] = [OFXMLElement elementWithName: @"foo" namespace: @"urn:objfw:test"]) && R([elem[2] addAttributeWithName: @"test" namespace: @"urn:objfw:test" stringValue: @"test"]) && R([elem[2] setPrefix: @"objfw-test" forNamespace: @"urn:objfw:test"]) && [[elem[2] string] isEqual: @"<objfw-test:foo test='test'/>"]) TEST(@"+[elementWithName:namespace:stringValue:]", (elem[3] = [OFXMLElement elementWithName: @"foo" namespace: @"urn:objfw:test" stringValue: @"x"]) && R([elem[3] setPrefix: @"objfw-test" forNamespace: @"urn:objfw:test"]) && [[elem[3] string] isEqual: @"<objfw-test:foo>x</objfw-test:foo>"]) TEST(@"-[addAttributeWithName:stringValue:]", R([elem[0] addAttributeWithName: @"foo" stringValue: @"b&ar"]) && [[elem[0] string] isEqual: @"<foo foo='b&ar'/>"] && R([elem[1] addAttributeWithName: @"foo" stringValue: @"b&ar"]) && [[elem[1] string] isEqual: @"<foo foo='b&ar'>b&ar</foo>"]) TEST(@"-[setPrefix:forNamespace:]", R([elem[1] setPrefix: @"objfw-test" forNamespace: @"urn:objfw:test"])) TEST(@"-[addAttributeWithName:namespace:stringValue:]", R([elem[1] addAttributeWithName: @"foo" namespace: @"urn:objfw:test" stringValue: @"bar"]) && [[elem[1] string] isEqual: @"<foo foo='b&ar' objfw-test:foo='bar'>b&ar</foo>"]) TEST(@"-[addChild:]", R([elem[0] addChild: [OFXMLElement elementWithName: @"bar"]]) && [[elem[0] string] isEqual: @"<foo foo='b&ar'><bar/></foo>"] && R([elem[2] addChild: [OFXMLElement elementWithName: @"bar" namespace: @"urn:objfw:test"]]) && [[elem[2] string] isEqual: @"<objfw-test:foo test='test'><objfw-test:bar/></objfw-test:foo>"]) [pool drain]; } @end |
Modified tests/OFXMLParserTests.m from [7f2966e759] to [36d27ced4a].
︙ | ︙ | |||
38 39 40 41 42 43 44 | prefix: (OFString*)prefix namespace: (OFString*)ns attributes: (OFArray*)attrs string: (OFString*)string comment: (OFString*)comment { OFString *msg; | < < < | < < < < | < < < < < < < < < < < | > > | < | < < < | | > | | | | < > > | > | < < < | | > > > > > > > > | | | > > > > > > > > > > > > | | < > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > | > > > > > > | > > > > | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 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 | prefix: (OFString*)prefix namespace: (OFString*)ns attributes: (OFArray*)attrs string: (OFString*)string comment: (OFString*)comment { OFString *msg; i++; msg = [OFString stringWithFormat: @"Parsing part #%d", i]; switch (i) { case 1: TEST(msg, et == STRING && [string isEqual: @"foo"]) break; case 2: TEST(msg, et == TAG_START && [name isEqual: @"bar"] && prefix == nil && ns == nil && attrs == nil) break; case 3: TEST(msg, et == TAG_END && [name isEqual: @"bar"] && prefix == nil && ns == nil && attrs == nil) break; case 4: /* FIXME: -[removeLeadingAndTrailingWhitespaces removes this */ TEST(msg, et == STRING && [string isEqual: @""]) break; case 5: TEST(msg, et == TAG_START && [name isEqual: @"foobar"] && prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"] && [attrs count] == 1 && /* xmlns attr */ [[[attrs objectAtIndex: 0] name] isEqual: @"xmlns"] && [[attrs objectAtIndex: 0] namespace] == nil && [[[attrs objectAtIndex: 0] stringValue] isEqual: @"urn:objfw:test:foobar"]) break; case 6: /* FIXME: -[removeLeadingAndTrailingWhitespaces removes this */ TEST(msg, et == STRING && [string isEqual: @""]) break; case 7: TEST(msg, et == TAG_START && [name isEqual: @"qux"] && prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"] && [attrs count] == 1 && /* xmlns:foo attr */ [[[attrs objectAtIndex: 0] name] isEqual: @"foo"] && [[[attrs objectAtIndex: 0] namespace] isEqual: @"http://www.w3.org/2000/xmlns/"] && [[[attrs objectAtIndex: 0] stringValue] isEqual: @"urn:objfw:test:foo"]) break; case 8: /* FIXME: -[removeLeadingAndTrailingWhitespaces removes this */ TEST(msg, et == STRING && [string isEqual: @""]) break; case 9: TEST(msg, et == TAG_START && [name isEqual: @"bla"] && [prefix isEqual: @"foo"] && [ns isEqual: @"urn:objfw:test:foo"] && [attrs count] == 2 && /* foo:bla attr */ [[[attrs objectAtIndex: 0] name] isEqual: @"bla"] && [[[attrs objectAtIndex: 0] namespace] isEqual: @"urn:objfw:test:foo"] && [[[attrs objectAtIndex: 0] stringValue] isEqual: @"bla"] && /* blafoo attr */ [[[attrs objectAtIndex: 1] name] isEqual: @"blafoo"] && [[[attrs objectAtIndex: 1] namespace] isEqual: @"urn:objfw:test:foo"] && [[[attrs objectAtIndex: 1] stringValue] isEqual: @"foo"]) break; case 10: /* FIXME: -[removeLeadingAndTrailingWhitespaces removes this */ TEST(msg, et == STRING && [string isEqual: @""]) break; case 11: TEST(msg, et == TAG_START && [name isEqual: @"blup"] && prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"] && [attrs count] == 2 && /* foo:qux attr */ [[[attrs objectAtIndex: 0] name] isEqual: @"qux"] && [[[attrs objectAtIndex: 0] namespace] isEqual: @"urn:objfw:test:foo"] && [[[attrs objectAtIndex: 0] stringValue] isEqual: @"asd"] && /* quxqux attr */ [[[attrs objectAtIndex: 1] name] isEqual: @"quxqux"] && [[[attrs objectAtIndex: 1] namespace] isEqual: @"urn:objfw:test:foobar"] && [[[attrs objectAtIndex: 1] stringValue] isEqual: @"test"]) break; case 12: TEST(msg, et == TAG_END && [name isEqual: @"blup"] && prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"]) break; case 13: /* FIXME: -[removeLeadingAndTrailingWhitespaces removes this */ TEST(msg, et == STRING && [string isEqual: @""]) break; case 14: TEST(msg, et == TAG_START && [name isEqual: @"bla"] && [prefix isEqual: @"bla"] && [ns isEqual: @"urn:objfw:test:bla"] && [attrs count] == 3 && /* xmlns:bla attr */ [[[attrs objectAtIndex: 0] name] isEqual: @"bla"] && [[[attrs objectAtIndex: 0] namespace] isEqual: @"http://www.w3.org/2000/xmlns/"] && [[[attrs objectAtIndex: 0] stringValue] isEqual: @"urn:objfw:test:bla"] && /* qux attr */ [[[attrs objectAtIndex: 1] name] isEqual: @"qux"] && [[[attrs objectAtIndex: 1] namespace] isEqual: @"urn:objfw:test:bla"] && [[[attrs objectAtIndex: 1] stringValue] isEqual: @"qux"] && /* bla:foo attr */ [[[attrs objectAtIndex: 2] name] isEqual: @"foo"] && [[[attrs objectAtIndex: 2] namespace] isEqual: @"urn:objfw:test:bla"] && [[[attrs objectAtIndex: 2] stringValue] isEqual: @"blafoo"]) break; case 15: TEST(msg, et == TAG_END && [name isEqual: @"bla"] && [prefix isEqual: @"bla"] && [ns isEqual: @"urn:objfw:test:bla"]) break; case 16: /* FIXME: -[removeLeadingAndTrailingWhitespaces removes this */ TEST(msg, et == STRING && [string isEqual: @""]) break; case 17: TEST(msg, et == TAG_START && [name isEqual: @"abc"] && prefix == nil && [ns isEqual: @"urn:objfw:test:abc"] && [attrs count] == 3 && /* xmlns attr */ [[[attrs objectAtIndex: 0] name] isEqual: @"xmlns"] && [[attrs objectAtIndex: 0] namespace] == nil && [[[attrs objectAtIndex: 0] stringValue] isEqual: @"urn:objfw:test:abc"] && /* abc attr */ [[[attrs objectAtIndex: 1] name] isEqual: @"abc"] && [[[attrs objectAtIndex: 1] namespace] isEqual: @"urn:objfw:test:abc"] && [[[attrs objectAtIndex: 1] stringValue] isEqual: @"abc"] && /* foo:abc attr */ [[[attrs objectAtIndex: 2] name] isEqual: @"abc"] && [[[attrs objectAtIndex: 2] namespace] isEqual: @"urn:objfw:test:foo"] && [[[attrs objectAtIndex: 2] stringValue] isEqual: @"abc"]) break; case 18: TEST(msg, et == TAG_END && [name isEqual: @"abc"] && prefix == nil && [ns isEqual: @"urn:objfw:test:abc"]) break; case 19: /* FIXME: -[removeLeadingAndTrailingWhitespaces removes this */ TEST(msg, et == STRING && [string isEqual: @""]) break; case 20: TEST(msg, et == TAG_END && [name isEqual: @"bla"] && [prefix isEqual: @"foo"] && [ns isEqual: @"urn:objfw:test:foo"]) break; case 21: /* FIXME: -[removeLeadingAndTrailingWhitespaces removes this */ TEST(msg, et == STRING && [string isEqual: @""]) break; case 22: TEST(msg, et == COMMENT && [comment isEqual: @"commänt"]) break; case 23: /* FIXME: -[removeLeadingAndTrailingWhitespaces removes this */ TEST(msg, et == STRING && [string isEqual: @""]) break; case 24: TEST(msg, et == TAG_END && [name isEqual: @"qux"] && prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"]) break; case 25: /* FIXME: -[removeLeadingAndTrailingWhitespaces removes this */ TEST(msg, et == STRING && [string isEqual: @""]) break; case 26: TEST(msg, et == TAG_END && [name isEqual: @"foobar"] && prefix == nil && [ns isEqual: @"urn:objfw:test:foobar"]) break; } } - (void)xmlParser: (OFXMLParser*)parser didStartTagWithName: (OFString*)name prefix: (OFString*)prefix |
︙ | ︙ | |||
183 184 185 186 187 188 189 | return nil; } - (void)XMLParserTests { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFXMLParser *parser; | | > | > > > > > | > > > | | 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 | return nil; } - (void)XMLParserTests { OFAutoreleasePool *pool = [[OFAutoreleasePool alloc] init]; OFXMLParser *parser; const char *str = "foo<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\rxmlns:bla=\"urn:objfw:test:bla\" qux='qux'\r\n" " bla:foo='blafoo'/>\n" " <abc xmlns='urn:objfw:test:abc' abc='abc' foo:abc='abc'/>\n" " </foo:bla>\n" " <!-- commänt -->\n" " </qux>\n" "</foobar>"; size_t j, len; TEST(@"+[xmlParser]", (parser = [OFXMLParser xmlParser])) TEST(@"-[setDelegate:]", R([parser setDelegate: self])) /* Simulate a stream where we only get chunks */ len = strlen(str); for (j = 0; j < len; j+= 2) { if (j + 2 > len) [parser parseBuffer: str + j withSize: 1]; else [parser parseBuffer: str + j withSize: 2]; } TEST(@"Checking if everything was parsed", i == 26) [pool drain]; } @end |