ObjFW  Diff

Differences From Artifact [1b7e4a8b63]:

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

To Artifact [5e48577b79]:


825
826
827
828
829
830
831
832
833


834
835
836
837
838
839
840




841
842
843
844
845
846
847

848
849
850
851
852
853
854

855
856

857
858
859


860
861
862
863
864
865
866

867
868

869
870

871
872
825
826
827
828
829
830
831


832
833
834
835
836




837
838
839
840
841
842
843
844
845
846

847
848
849
850
851
852
853

854
855

856
857


858
859
860
861
862
863
864
865

866
867

868
869

870
871
872







-
-
+
+



-
-
-
-
+
+
+
+






-
+






-
+

-
+

-
-
+
+






-
+

-
+

-
+



	return [current autorelease];
}
#endif
@end

@implementation OFArrayEnumerator
- initWithArray: (OFArray*)array_
   mutationsPtr: (unsigned long*)mutationsPtr_
- initWithArray: (OFArray*)array
   mutationsPtr: (unsigned long*)mutationsPtr
{
	self = [super init];

	array = [array_ retain];
	count = [array count];
	mutations = (mutationsPtr_ != NULL ? *mutationsPtr_ : 0);
	mutationsPtr = mutationsPtr_;
	_array = [array retain];
	_count = [array count];
	_mutations = (mutationsPtr != NULL ? *mutationsPtr : 0);
	_mutationsPtr = mutationsPtr;

	return self;
}

- (void)dealloc
{
	[array release];
	[_array release];

	[super dealloc];
}

- (id)nextObject
{
	if (mutationsPtr != NULL && *mutationsPtr != mutations)
	if (_mutationsPtr != NULL && *_mutationsPtr != _mutations)
		@throw [OFEnumerationMutationException
		    exceptionWithObject: array];
		    exceptionWithObject: _array];

	if (position < count)
		return [array objectAtIndex: position++];
	if (_position < _count)
		return [_array objectAtIndex: _position++];

	return nil;
}

- (void)reset
{
	if (mutationsPtr != NULL && *mutationsPtr != mutations)
	if (_mutationsPtr != NULL && *_mutationsPtr != _mutations)
		@throw [OFEnumerationMutationException
		    exceptionWithObject: array];
		    exceptionWithObject: _array];

	position = 0;
	_position = 0;
}
@end