ObjFW  Diff

Differences From Artifact [ecddbe546f]:

To Artifact [a4f9d416aa]:

  • File src/exceptions/OFUnboundPrefixException.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: 1675) [annotate] [blame] [check-ins using]


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
#import "OFUnboundPrefixException.h"
#import "OFString.h"
#import "OFXMLParser.h"

#import "common.h"

@implementation OFUnboundPrefixException
+ (instancetype)exceptionWithClass: (Class)class
			    prefix: (OFString*)prefix
			    parser: (OFXMLParser*)parser
{
	return [[[self alloc] initWithClass: class
				     prefix: prefix
				     parser: parser] autorelease];
}

- initWithClass: (Class)class
{
	@try {
		[self doesNotRecognizeSelector: _cmd];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	abort();
}

- initWithClass: (Class)class
	 prefix: (OFString*)prefix
	 parser: (OFXMLParser*)parser
{
	self = [super initWithClass: class];

	@try {
		_prefix = [prefix copy];
		_parser = [parser retain];
	} @catch (id e) {
		[self release];
		@throw e;







|
<
|

|
<
|


|











<
|
|

|







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
#import "OFUnboundPrefixException.h"
#import "OFString.h"
#import "OFXMLParser.h"

#import "common.h"

@implementation OFUnboundPrefixException
+ (instancetype)exceptionWithPrefix: (OFString*)prefix

			     parser: (OFXMLParser*)parser
{
	return [[[self alloc] initWithPrefix: prefix

				      parser: parser] autorelease];
}

- init
{
	@try {
		[self doesNotRecognizeSelector: _cmd];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	abort();
}


- initWithPrefix: (OFString*)prefix
	  parser: (OFXMLParser*)parser
{
	self = [super init];

	@try {
		_prefix = [prefix copy];
		_parser = [parser retain];
	} @catch (id e) {
		[self release];
		@throw e;
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90

	[super dealloc];
}

- (OFString*)description
{
	return [OFString stringWithFormat:
	    @"The XML parser in class %@ encountered the unbound prefix %@ in "
	    @"line %zd!", _inClass, _prefix, [_parser lineNumber]];
}

- (OFString*)prefix
{
	OF_GETTER(_prefix, false)
}

- (OFXMLParser*)parser
{
	OF_GETTER(_parser, false)
}
@end







|
|












67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87

	[super dealloc];
}

- (OFString*)description
{
	return [OFString stringWithFormat:
	    @"An XML parser of type %@ encountered the unbound prefix %@ in "
	    @"line %zd!", [_parser class], _prefix, [_parser lineNumber]];
}

- (OFString*)prefix
{
	OF_GETTER(_prefix, false)
}

- (OFXMLParser*)parser
{
	OF_GETTER(_parser, false)
}
@end