Overview
| Comment: | Add -[OFString rangeOfString:options:range:]. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
20dddc7345ffd900339519a9c1e82e52 |
| User & Date: | js on 2012-10-13 22:21:40 |
| Other Links: | manifest | tags |
Context
|
2012-10-14
| ||
| 00:54 | range.start -> range.location. check-in: c9433ea60d user: js tags: trunk | |
|
2012-10-13
| ||
| 22:21 | Add -[OFString rangeOfString:options:range:]. check-in: 20dddc7345 user: js tags: trunk | |
| 21:29 | Rename s->UTF8 to s->isUTF8. check-in: 9817eab3be user: js tags: trunk | |
Changes
Modified src/OFString.h from [2f006f43b3] to [0ffb1811bb].
| ︙ | ︙ | |||
630 631 632 633 634 635 636 637 638 639 640 641 642 643 | * \param options Options modifying search behaviour * \return The range of the first occurrence of the string or a range with * OF_INVALID_INDEX as start position if it was not found */ - (of_range_t)rangeOfString: (OFString*)string options: (of_string_search_options_t)options; /** * \brief Returns whether the string contains the specified string. * * \param string The string to search * \return Whether the string contains the specified string */ - (BOOL)containsString: (OFString*)string; | > > > > > > > > > > > > > | 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 | * \param options Options modifying search behaviour * \return The range of the first occurrence of the string or a range with * OF_INVALID_INDEX as start position if it was not found */ - (of_range_t)rangeOfString: (OFString*)string options: (of_string_search_options_t)options; /** * \brief Returns the range of the string in the specified range. * * \param string The string to search * \param options Options modifying search behaviour * \param range The range in which to search * \return The range of the first occurrence of the string or a range with * OF_INVALID_INDEX as start position if it was not found */ - (of_range_t)rangeOfString: (OFString*)string options: (of_string_search_options_t)options range: (of_range_t)range; /** * \brief Returns whether the string contains the specified string. * * \param string The string to search * \return Whether the string contains the specified string */ - (BOOL)containsString: (OFString*)string; |
| ︙ | ︙ |
Modified src/OFString.m from [3d2b1f904a] to [9f1383c46f].
| ︙ | ︙ | |||
1154 1155 1156 1157 1158 1159 1160 |
return JSON;
}
- (of_range_t)rangeOfString: (OFString*)string
{
return [self rangeOfString: string
| > > > > > > > > | > > | > | | > > > < > > > > > > > > > > | | | | | > | | | | | | | | | | | > | | | > > > | 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 |
return JSON;
}
- (of_range_t)rangeOfString: (OFString*)string
{
return [self rangeOfString: string
options: 0
range: of_range(0, [self length])];
}
- (of_range_t)rangeOfString: (OFString*)string
options: (of_string_search_options_t)options
{
return [self rangeOfString: string
options: options
range: of_range(0, [self length])];
}
- (of_range_t)rangeOfString: (OFString*)string
options: (of_string_search_options_t)options
range: (of_range_t)range
{
void *pool;
const of_unichar_t *searchString;
of_unichar_t *unicodeString;
size_t i, searchLength;
if ((searchLength = [string length]) == 0)
return of_range(0, 0);
if (searchLength > range.length)
return of_range(OF_INVALID_INDEX, 0);
if (range.length > SIZE_MAX / sizeof(of_unichar_t))
@throw [OFOutOfRangeException exceptionWithClass: [self class]];
pool = objc_autoreleasePoolPush();
searchString = [string unicodeString];
unicodeString = malloc(range.length * sizeof(of_unichar_t));
if (unicodeString == NULL)
@throw [OFOutOfMemoryException
exceptionWithClass: [self class]
requestedSize: range.length * sizeof(of_unichar_t)];
@try {
[self getCharacters: unicodeString
inRange: range];
if (options & OF_STRING_SEARCH_BACKWARDS) {
for (i = range.length - searchLength;; i--) {
if (!memcmp(unicodeString + i, searchString,
searchLength * sizeof(of_unichar_t))) {
objc_autoreleasePoolPop(pool);
return of_range(range.start + i,
searchLength);
}
/* No match and we're at the last character */
if (i == 0)
break;
}
} else {
for (i = 0; i <= range.length - searchLength; i++) {
if (!memcmp(unicodeString + i, searchString,
searchLength * sizeof(of_unichar_t))) {
objc_autoreleasePoolPop(pool);
return of_range(range.start + i,
searchLength);
}
}
}
} @finally {
free(unicodeString);
}
objc_autoreleasePoolPop(pool);
return of_range(OF_INVALID_INDEX, 0);
}
|
| ︙ | ︙ |
Modified src/OFString_UTF8.m from [dd6ca8a27b] to [f8f277011d].
| ︙ | ︙ | |||
1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 |
range.length * sizeof(of_unichar_t));
objc_autoreleasePoolPop(pool);
}
- (of_range_t)rangeOfString: (OFString*)string
options: (of_string_search_options_t)options
{
const char *cString = [string UTF8String];
size_t i, cStringLength = [string UTF8StringLength];
if (cStringLength == 0)
return of_range(0, 0);
| > > > > > > > > > > > > > | > | | | | > | > > > | | | | > | > > > > | 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 |
range.length * sizeof(of_unichar_t));
objc_autoreleasePoolPop(pool);
}
- (of_range_t)rangeOfString: (OFString*)string
options: (of_string_search_options_t)options
range: (of_range_t)range
{
const char *cString = [string UTF8String];
size_t i, cStringLength = [string UTF8StringLength];
size_t rangeStart, rangeLength;
if (s->isUTF8) {
rangeStart = of_string_utf8_get_position(
s->cString, range.start, s->cStringLength);
rangeLength = of_string_utf8_get_position(
s->cString + rangeStart, range.length,
s->cStringLength - rangeStart);
} else {
rangeStart = range.start;
rangeLength = range.length;
}
if (cStringLength == 0)
return of_range(0, 0);
if (cStringLength > rangeLength ||
rangeStart + rangeLength > s->cStringLength)
return of_range(OF_INVALID_INDEX, 0);
if (options & OF_STRING_SEARCH_BACKWARDS) {
for (i = rangeLength - cStringLength;; i--) {
if (!memcmp(s->cString + rangeStart + i, cString,
cStringLength)) {
range.start += of_string_utf8_get_index(
s->cString + rangeStart, i);
range.length = [string length];
return range;
}
/* Did not match and we're at the last char */
if (i == 0)
return of_range(OF_INVALID_INDEX, 0);
}
} else {
for (i = 0; i <= rangeLength - cStringLength; i++) {
if (!memcmp(s->cString + rangeStart + i, cString,
cStringLength)) {
range.start += of_string_utf8_get_index(
s->cString + rangeStart, i);
range.length = [string length];
return range;
}
}
}
return of_range(OF_INVALID_INDEX, 0);
}
- (BOOL)containsString: (OFString*)string
{
|
| ︙ | ︙ |