Differences From Artifact [e1f46dcc8c]:
- File src/OFXMLParser.m — part of check-in [3a9a5001cf] at 2011-03-24 21:29:14 on branch trunk — Pass the parser for OFMalformedXMLExceptions. (user: js, size: 23445) [annotate] [blame] [check-ins using]
To Artifact [327f362f7a]:
- File
src/OFXMLParser.m
— part of check-in
[59e52af26d]
at
2011-07-17 01:55:16
on branch 0.5
— Define __NO_EXT_QNX in files using unistd.h or fcntl.h.
Without this, the headers try to declare functions that use __block as
an argument name and thus fail to compile when using -fblocks. (user: js, size: 25387) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
15 16 17 18 19 20 21 | */ #include "config.h" #define OF_XML_PARSER_M #include <string.h> | > | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | */ #include "config.h" #define OF_XML_PARSER_M #include <string.h> #include <sys/types.h> #import "OFXMLParser.h" #import "OFString.h" #import "OFArray.h" #import "OFDictionary.h" #import "OFXMLAttribute.h" #import "OFStream.h" |
︙ | ︙ | |||
47 48 49 50 51 52 53 | [cache replaceOccurrencesOfString: @"\r\n" withString: @"\n"]; [cache replaceOccurrencesOfString: @"\r" withString: @"\n"]; return [cache stringByXMLUnescapingWithDelegate: delegate]; } | | | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | [cache replaceOccurrencesOfString: @"\r\n" withString: @"\n"]; [cache replaceOccurrencesOfString: @"\r" withString: @"\n"]; return [cache stringByXMLUnescapingWithDelegate: delegate]; } static OFString* namespace_for_prefix(OFString *prefix, OFArray *namespaces) { OFDictionary **carray = [namespaces cArray]; ssize_t i; if (prefix == nil) prefix = @""; |
︙ | ︙ | |||
153 154 155 156 157 158 159 160 161 162 163 164 165 166 | 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]; lineNumber = 1; [pool release]; } @catch (id e) { [self release]; @throw e; } | > | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 | 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]; acceptProlog = YES; lineNumber = 1; [pool release]; } @catch (id e) { [self release]; @throw e; } |
︙ | ︙ | |||
263 264 265 266 267 268 269 | } @finally { [file release]; } } /* * The following methods handle the different states of the parser. They are | | | | > | 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 | } @finally { [file release]; } } /* * The following methods handle the different states of the parser. They are * looked up in +[initialize] and put in a lookup table to speed things up. * One dispatch for every character would be way too slow! */ /* Not in a tag */ - (void)_parseOutsideTagWithBuffer: (const char*)buf i: (size_t*)i last: (size_t*)last { size_t len; if ((finishedParsing || [previous count] < 1) && buf[*i] != ' ' && buf[*i] != '\t' && buf[*i] != '\n' && buf[*i] != '\r' && buf[*i] != '<') @throw [OFMalformedXMLException newWithClass: isa parser: self]; if (buf[*i] != '<') return; if ((len = *i - *last) > 0) |
︙ | ︙ | |||
315 316 317 318 319 320 321 | } /* Tag was just opened */ - (void)_parseTagOpenedWithBuffer: (const char*)buf i: (size_t*)i last: (size_t*)last { | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 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 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 | } /* Tag was just opened */ - (void)_parseTagOpenedWithBuffer: (const char*)buf i: (size_t*)i last: (size_t*)last { if (finishedParsing && buf[*i] != '!' && buf[*i] != '?') @throw [OFMalformedXMLException newWithClass: isa parser: self]; switch (buf[*i]) { case '?': *last = *i + 1; state = OF_XMLPARSER_IN_PROCESSING_INSTRUCTIONS; level = 0; break; case '/': *last = *i + 1; state = OF_XMLPARSER_IN_CLOSE_TAG_NAME; acceptProlog = NO; break; case '!': *last = *i + 1; state = OF_XMLPARSER_IN_EXCLAMATIONMARK; acceptProlog = NO; break; default: state = OF_XMLPARSER_IN_TAG_NAME; acceptProlog = NO; (*i)--; break; } } /* <?xml […]?> */ - (BOOL)_parseXMLProcessingInstructions: (OFString*)pi { const char *pi_c; size_t i, last, pi_len; int xstate = 0; OFString *attr = nil; OFString *val = nil; char xdelim = 0; if (!acceptProlog) return NO; acceptProlog = NO; pi = [pi substringFromIndex: 3 toIndex: [pi length]]; pi = [pi stringByDeletingLeadingAndTrailingWhitespaces]; pi_c = [pi cString]; pi_len = [pi cStringLength]; for (i = last = 0; i < pi_len; i++) { switch (xstate) { case 0: if (pi_c[i] == ' ' || pi_c[i] == '\t' || pi_c[i] == '\r' || pi_c[i] == '\n') continue; last = i; xstate = 1; i--; break; case 1: if (pi_c[i] != '=') continue; attr = [OFString stringWithCString: pi_c + last length: i - last]; last = i + 1; xstate = 2; break; case 2: if (pi_c[i] != '\'' && pi_c[i] != '"') return NO; xdelim = pi_c[i]; last = i + 1; xstate = 3; break; case 3: if (pi_c[i] != xdelim) continue; val = [OFString stringWithCString: pi_c + last length: i - last]; if ([attr isEqual: @"version"]) if (![val hasPrefix: @"1."]) return NO; if ([attr isEqual: @"encoding"]) if ([val caseInsensitiveCompare: @"utf-8"] != OF_ORDERED_SAME) return NO; last = i + 1; xstate = 0; break; } } if (xstate != 0) return NO; return YES; } /* Inside processing instructions */ - (void)_parseInProcessingInstructionsWithBuffer: (const char*)buf i: (size_t*)i last: (size_t*)last { if (buf[*i] == '?') level = 1; else if (level == 1 && buf[*i] == '>') { |
︙ | ︙ | |||
366 367 368 369 370 371 372 373 374 375 376 377 378 379 | /* * Class swizzle the string to be immutable. We pass it as * OFString*, so it can't be modified anyway. But not swizzling * it would create a real copy each time -[copy] is called. */ pi->isa = [OFString class]; [delegate parser: self foundProcessingInstructions: pi]; [pool release]; [cache setToCString: ""]; | > > > > > > > > | 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 | /* * Class swizzle the string to be immutable. We pass it as * OFString*, so it can't be modified anyway. But not swizzling * it would create a real copy each time -[copy] is called. */ pi->isa = [OFString class]; if ([pi isEqual: @"xml"] || [pi hasPrefix: @"xml "] || [pi hasPrefix: @"xml\t"] || [pi hasPrefix: @"xml\r"] || [pi hasPrefix: @"xml\n"]) if (![self _parseXMLProcessingInstructions: pi]) @throw [OFMalformedXMLException newWithClass: isa parser: self]; [delegate parser: self foundProcessingInstructions: pi]; [pool release]; [cache setToCString: ""]; |
︙ | ︙ | |||
444 445 446 447 448 449 450 451 452 453 454 455 456 457 | 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]; | > > > | 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 | elementEndHandler(self, name, prefix, ns); else #endif [delegate parser: self didEndElement: name withPrefix: prefix namespace: ns]; if ([previous count] == 0) finishedParsing = YES; } else [previous addObject: [[cache copy] autorelease]]; [pool release]; [name release]; [prefix release]; |
︙ | ︙ | |||
599 600 601 602 603 604 605 606 607 608 609 610 611 612 | 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: @"%@:%@", prefix, name]; [previous addObject: str]; } else | > > > | 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 | elementEndHandler(self, name, prefix, ns); else #endif [delegate parser: self didEndElement: name withPrefix: prefix namespace: ns]; if ([previous count] == 0) finishedParsing = YES; [namespaces removeNObjects: 1]; } else if (prefix != nil) { OFString *str = [OFString stringWithFormat: @"%@:%@", prefix, name]; [previous addObject: str]; } else |
︙ | ︙ |