ObjFW  Diff

Differences From Artifact [3219b4036a]:

To Artifact [9c788f37d8]:


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
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







-
+





-
+


-
+









-
+


-
+











-
+


-
+









-
+


-
+




}

- (id)objectAtIndex: (size_t)index
{
	if (index >= range.length)
		@throw [OFOutOfRangeException exceptionWithClass: [self class]];

	return [array objectAtIndex: index + range.start];
	return [array objectAtIndex: index + range.location];
}

- (void)getObjects: (id*)buffer
	   inRange: (of_range_t)range_
{
	if (range_.start + range_.length > range.length)
	if (range_.location + range_.length > range.length)
		@throw [OFOutOfRangeException exceptionWithClass: [self class]];

	range_.start += range.start;
	range_.location += range.location;

	return [array getObjects: buffer
			 inRange: range_];
}

- (size_t)indexOfObject: (id)object
{
	size_t index = [array indexOfObject: object];

	if (index < range.start)
	if (index < range.location)
		return OF_INVALID_INDEX;

	index -= range.start;
	index -= range.location;

	if (index >= range.length)
		return OF_INVALID_INDEX;

	return index;
}

- (size_t)indexOfObjectIdenticalTo: (id)object
{
	size_t index = [array indexOfObjectIdenticalTo: object];

	if (index < range.start)
	if (index < range.location)
		return OF_INVALID_INDEX;

	index -= range.start;
	index -= range.location;

	if (index >= range.length)
		return OF_INVALID_INDEX;

	return index;
}

- (OFArray*)objectsInRange: (of_range_t)range_
{
	if (range_.start + range_.length > range.length)
	if (range_.location + range_.length > range.length)
		@throw [OFOutOfRangeException exceptionWithClass: [self class]];

	range_.start += range.start;
	range_.location += range.location;

	return [array objectsInRange: range_];
}
@end