ObjFW  Check-in [86a2329f2b]

Overview
Comment:Fix -[OFArray_subarray indexOfObject:].
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 86a2329f2be5b76735f1713b3a1733d6cc0c6938d67b3dc58f45594419f04d3b
User & Date: js on 2011-09-11 14:04:56
Other Links: manifest | tags
Context
2011-09-11
17:09
Documentation improvements. check-in: 8d554c0421 user: js tags: trunk
14:04
Fix -[OFArray_subarray indexOfObject:]. check-in: 86a2329f2b user: js tags: trunk
12:17
Add new files to Xcode project. check-in: 20a15c98a8 user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified src/OFArray_subarray.m from [bf200eb01f] to [77e6be7acc].

︙
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

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








-
+

+
+
+
+
+
-
-
+
+






-
+

+
+
+
+
+
-
-
+
+









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

- (size_t)indexOfObject: (id)object
{
	size_t index = [array indexOfObject: object] + range.start;
	size_t index = [array indexOfObject: object];

	if (index < range.start)
		return OF_INVALID_INDEX;

	index -= range.start;

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

	return index;
}

- (size_t)indexOfObjectIdenticalTo: (id)object
{
	size_t index = [array indexOfObjectIdenticalTo: object] + range.start;
	size_t index = [array indexOfObjectIdenticalTo: object];

	if (index < range.start)
		return OF_INVALID_INDEX;

	index -= range.start;

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

	return index;
}

- (OFArray*)objectsInRange: (of_range_t)range_
{
	if (range_.start + range_.length > range.length)
︙

Fossil 2.23 [47362306a7] 2023-11-01 18:56:47
This page was generated in about 0.017s