ObjFW: Diff

Differences From Artifact [12e7c5b831]:

File src/OFXMLParser.m — part of check-in [457e0e82af] at 2013-06-16 20:03:47 on branch trunk — Split OFUnboundNamespaceException.
OFUnboundNamespaceException is now only used when the namespace is not
bound. If the prefix is not bound, OFUnboundPrefixException is used now. (user: js, size: 24490) [annotate] [blame] [check-ins using]

To Artifact [c5cbe08edf]:

File src/OFXMLParser.m — part of check-in [3d16a30f41] at 2013-06-22 12:12:36 on branch trunk — Rework exceptions.
This mostly removes the argument for the class in which the exception
occurred. As backtraces were recently added for all platforms, the
passed class does not give any extra information on where the exception
occurred anymore.
This also removes a few other arguments which were not too helpful. In
the past, the idea was to pass as many arguments as possible so that it
is easier to find the origin of the exception. However, as backtraces
are a much better way to find the origin, those are not useful anymore
and just make the exception more cumbersome to use. The rule is now to
only pass arguments that might help in recovering from the exception or
provide information that is otherwise not easily accessible. (user: js, size: 23947) [annotate] [blame] [check-ins using]

︙
123 124 125 126 127 128 129 ~~130 131 132~~ 133 134 135 136 137 138 139	123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138	- - - + +	if (attributePrefix == nil) return; attributeNS = namespace_for_prefix(attributePrefix, namespaces); if ((attributePrefix != nil && attributeNS == nil)) @throw [OFUnboundPrefixException ~~~~exceptionWithClass: [self class]~~ prefix: attributePrefix parser: self];~~ exceptionWithPrefix: attributePrefix parser: self]; [attribute->_namespace release]; attribute->_namespace = [attributeNS retain]; } @implementation OFXMLParser + (void)initialize
︙
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	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	- + - - + -	if (_data[_i] != "\xEF\xBB\xBF"[_level]) { if (_level == 0) { _state = OF_XMLPARSER_OUTSIDE_TAG; _i--; return; } ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ } if (_level++ == 2) _state = OF_XMLPARSER_OUTSIDE_TAG; _last = _i + 1; } /* Not in a tag */ - (void)OF_outsideTagState { size_t length; if ((_finishedParsing \|\| [_previous count] < 1) && _data[_i] != ' ' && _data[_i] != '\t' && _data[_i] != '\n' && _data[_i] != '\r' && _data[_i] != '<') ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ if (_data[_i] != '<') return; if ((length = _i - _last) > 0) buffer_append(_buffer, _data + _last, _encoding, length);
︙
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	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	- + - - - +	_state = OF_XMLPARSER_TAG_OPENED; } /* Tag was just opened */ - (void)OF_tagOpenedState { if (_finishedParsing && _data[_i] != '!' && _data[_i] != '?') ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ switch (_data[_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 = false; break; case '!': _last = _i + 1; _state = OF_XMLPARSER_IN_EXCLAMATIONMARK; _acceptProlog = false; break; default: if (_depthLimit > 0 && [_previous count] >= _depthLimit) @throw [OFMalformedXMLException ~~~~exceptionWithClass: [self class]~~ parser: self];~~ exceptionWithParser: self]; _state = OF_XMLPARSER_IN_TAG_NAME; _acceptProlog = false; _i--; break; } }
︙
520 521 522 523 524 525 526 ~~527 528~~ 529 530 531 532 533 534 535	515 516 517 518 519 520 521 522 523 524 525 526 527 528 529	- - +	PI = transform_string(_buffer, 1, false, nil); if ([PI isEqual: @"xml"] \|\| [PI hasPrefix: @"xml "] \|\| [PI hasPrefix: @"xml\t"] \|\| [PI hasPrefix: @"xml\r"] \|\| [PI hasPrefix: @"xml\n"]) if (![self OF_parseXMLProcessingInstructions: PI]) @throw [OFMalformedXMLException ~~~~exceptionWithClass: [self class]~~ parser: self];~~ exceptionWithParser: self]; if ([_delegate respondsToSelector: @selector(parser:foundProcessingInstructions:)]) [_delegate parser: self foundProcessingInstructions: PI]; objc_autoreleasePoolPop(pool);
︙
580 581 582 583 584 585 586 ~~587 588 589~~ 590 591 592 593 594 595 596	574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589	- - - + +	if (_data[_i] == '>' \|\| _data[_i] == '/') { OFString *namespace; namespace = namespace_for_prefix(_prefix, _namespaces); if (_prefix != nil && namespace == nil) @throw [OFUnboundPrefixException ~~~~exceptionWithClass: [self class]~~ prefix: _prefix parser: self];~~ exceptionWithPrefix: _prefix parser: self]; if ([_delegate respondsToSelector: @selector(parser: didStartElement:prefix:namespace:attributes:)]) [_delegate parser: self didStartElement: _name prefix: _prefix namespace: namespace
︙
660 661 662 663 664 665 666 ~~667~~ ~~668~~ 669 670 671 672 673 674 675 ~~676~~ ~~677 678 679~~ 680 681 682 683 684 685 686	653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676	- + - - + - - - +	length: tmp - bufferCString]; } else { _name = [bufferString copy]; _prefix = nil; } if (![[_previous lastObject] isEqual: bufferString]) ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ [_previous removeLastObject]; [_buffer removeAllItems]; namespace = namespace_for_prefix(_prefix, _namespaces); if (_prefix != nil && namespace == nil) ~~@throw [OFUnboundPrefixException~~ @throw [OFUnboundPrefixException exceptionWithPrefix: _prefix ~~~~exceptionWithClass: [self class]~~ ~~prefix: _prefix~~ parser: self];~~ parser: self]; if ([_delegate respondsToSelector: @selector(parser:didEndElement:prefix:namespace:)]) [_delegate parser: self didEndElement: _name prefix: _prefix namespace: namespace];
︙
722 723 724 725 726 727 728 ~~729~~ ~~730 731 732~~ 733 734 735 736 737 738 739	712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727	- + - - - +	attributesObjects = [_attributes objects]; attributesCount = [_attributes count]; namespace = namespace_for_prefix(_prefix, _namespaces); if (_prefix != nil && namespace == nil) ~~@throw [OFUnboundPrefixException~~ @throw [OFUnboundPrefixException exceptionWithPrefix: _prefix ~~~~exceptionWithClass: [self class]~~ ~~prefix: _prefix~~ parser: self];~~ parser: self]; for (j = 0; j < attributesCount; j++) resolve_attribute_namespace(attributesObjects[j], _namespaces, self); pool = objc_autoreleasePoolPush();
︙
829 830 831 832 833 834 835 ~~836~~ ~~837~~ 838 839 840 841 842 843 844	817 818 819 820 821 822 823 824 825 826 827 828 829 830 831	- + -	_last = _i + 1; if (_data[_i] == ' ' \|\| _data[_i] == '\t' \|\| _data[_i] == '\n' \|\| _data[_i] == '\r') return; if (_data[_i] != '\'' && _data[_i] != '"') ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ _delimiter = _data[_i]; _state = OF_XMLPARSER_IN_ATTR_VALUE; } /* Looking for attribute value */ - (void)OF_inAttributeValueState
︙
882 883 884 885 886 887 888 ~~889~~ ~~890~~ 891 892 893 894 895 896 897 898 899 900 ~~901~~ ~~902~~ 903 904 905 906 907 908 ~~909~~ ~~910~~ 911 912 913 914 915 916 917 918 919 920 ~~921~~ ~~922~~ 923 924 925 926 927 928 929 930 ~~931~~ ~~932~~ 933 934 935 936 937 938 939	869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921	- + - - + - - + - - + - - + -	/* Expecting closing '>' / - (void)OF_expectCloseState { if (_data[_i] == '>') { _last = _i + 1; _state = OF_XMLPARSER_OUTSIDE_TAG; } else ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ } / Expecting closing '>' or space / - (void)OF_expectSpaceOrCloseState { if (_data[_i] == '>') { _last = _i + 1; _state = OF_XMLPARSER_OUTSIDE_TAG; } else if (_data[_i] != ' ' && _data[_i] != '\t' && _data[_i] != '\n' && _data[_i] != '\r') ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ } / In <! / - (void)OF_inExclamationMarkState { if (_finishedParsing && _data[_i] != '-') ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ if (_data[_i] == '-') _state = OF_XMLPARSER_IN_COMMENT_OPENING; else if (_data[_i] == '[') { _state = OF_XMLPARSER_IN_CDATA_OPENING; _level = 0; } else if (_data[_i] == 'D') { _state = OF_XMLPARSER_IN_DOCTYPE; _level = 0; } else ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ _last = _i + 1; } / CDATA */ - (void)OF_inCDATAOpeningState { if (_data[_i] != "CDATA["[_level]) ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ if (++_level == 6) { _state = OF_XMLPARSER_IN_CDATA_1; _level = 0; } _last = _i + 1;
︙
979 980 981 982 983 984 985 ~~986~~ ~~987~~ 988 989 990 991 992 993 994	961 962 963 964 965 966 967 968 969 970 971 972 973 974 975	- + -	_state = OF_XMLPARSER_OUTSIDE_TAG; } /* Comment */ - (void)OF_inCommentOpeningState { if (_data[_i] != '-') ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ _last = _i + 1; _state = OF_XMLPARSER_IN_COMMENT_1; _level = 0; } - (void)OF_inCommentState1
︙
1004 1005 1006 1007 1008 1009 1010 ~~1011~~ ~~1012~~ 1013 1014 1015 1016 1017 1018 1019	985 986 987 988 989 990 991 992 993 994 995 996 997 998 999	- + -	- (void)OF_inCommentState2 { void pool; OFString comment; if (_data[_i] != '>') ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ pool = objc_autoreleasePoolPush(); buffer_append(_buffer, _data + _last, _encoding, _i - _last); comment = transform_string(_buffer, 2, false, nil); if ([_delegate respondsToSelector: @selector(parser:foundComment:)])
︙
1030 1031 1032 1033 1034 1035 1036 ~~1037~~ ~~1038~~ 1039 1040 1041 1042 1043 1044 1045	1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024	- + -	/* In <!DOCTYPE ...> */ - (void)OF_inDOCTYPEState { if ((_level < 6 && _data[_i] != "OCTYPE"[_level]) \|\| (_level == 6 && _data[_i] != ' ' && _data[_i] != '\t' && _data[_i] != '\n' && _data[_i] != '\r')) ~~@throw [OFMalformedXMLException exceptionWith~~Class~~: [self ~~class]~~~~ @throw [OFMalformedXMLException exceptionWithParser: self]; ~~parser: self];~~ _level++; if (_level > 6 && _data[_i] == '>') _state = OF_XMLPARSER_OUTSIDE_TAG; _last = _i + 1;
︙

ObjFW Diff

Differences From Artifact [12e7c5b831]:

To Artifact [c5cbe08edf]: