Differences From Artifact [a6ef5631a2]:
- File
src/OFURL.m
— part of check-in
[25c985fec1]
at
2020-08-25 00:11:24
on branch trunk
— OFNumber: Remove (u)int{8,16,32,64} methods
Since C guarantees minimum sizes for char, short, int, long and long
long, these can be used instead. (user: js, size: 24470) [annotate] [blame] [check-ins using] [more...]
To Artifact [529e3fc99f]:
- File src/OFURL.m — part of check-in [a151f9c31f] at 2020-10-03 23:25:55 on branch trunk — OFURL: Add queryDictionary property (user: js, size: 26119) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 |
@end
@interface OFURLPathAllowedCharacterSet: OFURLAllowedCharacterSetBase
@end
@interface OFURLQueryOrFragmentAllowedCharacterSet: OFURLAllowedCharacterSetBase
@end
static OFCharacterSet *URLAllowedCharacterSet = nil;
static OFCharacterSet *URLSchemeAllowedCharacterSet = nil;
static OFCharacterSet *URLPathAllowedCharacterSet = nil;
static OFCharacterSet *URLQueryOrFragmentAllowedCharacterSet = nil;
static of_once_t URLAllowedCharacterSetOnce = OF_ONCE_INIT;
static of_once_t URLQueryOrFragmentAllowedCharacterSetOnce = OF_ONCE_INIT;
static void
initURLAllowedCharacterSet(void)
{
| > > > > | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 |
@end
@interface OFURLPathAllowedCharacterSet: OFURLAllowedCharacterSetBase
@end
@interface OFURLQueryOrFragmentAllowedCharacterSet: OFURLAllowedCharacterSetBase
@end
@interface OFURLQueryKeyValueAllowedCharacterSet: OFURLAllowedCharacterSetBase
@end
static OFCharacterSet *URLAllowedCharacterSet = nil;
static OFCharacterSet *URLSchemeAllowedCharacterSet = nil;
static OFCharacterSet *URLPathAllowedCharacterSet = nil;
static OFCharacterSet *URLQueryOrFragmentAllowedCharacterSet = nil;
static OFCharacterSet *URLQueryKeyValueAllowedCharacterSet = nil;
static of_once_t URLAllowedCharacterSetOnce = OF_ONCE_INIT;
static of_once_t URLQueryOrFragmentAllowedCharacterSetOnce = OF_ONCE_INIT;
static void
initURLAllowedCharacterSet(void)
{
|
| ︙ | ︙ | |||
82 83 84 85 86 87 88 89 90 91 92 93 94 95 |
static void
initURLQueryOrFragmentAllowedCharacterSet(void)
{
URLQueryOrFragmentAllowedCharacterSet =
[[OFURLQueryOrFragmentAllowedCharacterSet alloc] init];
}
OF_DIRECT_MEMBERS
@interface OFInvertedCharacterSetWithoutPercent: OFCharacterSet
{
OFCharacterSet *_characterSet;
bool (*_characterIsMember)(id, SEL, of_unichar_t);
}
| > > > > > > > | 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 |
static void
initURLQueryOrFragmentAllowedCharacterSet(void)
{
URLQueryOrFragmentAllowedCharacterSet =
[[OFURLQueryOrFragmentAllowedCharacterSet alloc] init];
}
static void
initURLQueryKeyValueAllowedCharacterSet(void)
{
URLQueryKeyValueAllowedCharacterSet =
[[OFURLQueryKeyValueAllowedCharacterSet alloc] init];
}
OF_DIRECT_MEMBERS
@interface OFInvertedCharacterSetWithoutPercent: OFCharacterSet
{
OFCharacterSet *_characterSet;
bool (*_characterIsMember)(id, SEL, of_unichar_t);
}
|
| ︙ | ︙ | |||
245 246 247 248 249 250 251 252 253 254 255 256 257 258 |
case '?':
return true;
default:
return false;
}
}
@end
@implementation OFInvertedCharacterSetWithoutPercent
- (instancetype)initWithCharacterSet: (OFCharacterSet *)characterSet
{
self = [super init];
@try {
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 |
case '?':
return true;
default:
return false;
}
}
@end
@implementation OFURLQueryKeyValueAllowedCharacterSet
- (bool)characterIsMember: (of_unichar_t)character
{
if (character < CHAR_MAX && of_ascii_isalnum(character))
return true;
switch (character) {
case '-':
case '.':
case '_':
case '~':
case '!':
case '$':
case '\'':
case '(':
case ')':
case '*':
case '+':
case ',':
case ';':
case ':':
case '@':
case '/':
case '?':
return true;
default:
return false;
}
}
@end
@implementation OFInvertedCharacterSetWithoutPercent
- (instancetype)initWithCharacterSet: (OFCharacterSet *)characterSet
{
self = [super init];
@try {
|
| ︙ | ︙ | |||
337 338 339 340 341 342 343 344 345 346 347 348 349 350 |
+ (OFCharacterSet *)URLQueryAllowedCharacterSet
{
of_once(&URLQueryOrFragmentAllowedCharacterSetOnce,
initURLQueryOrFragmentAllowedCharacterSet);
return URLQueryOrFragmentAllowedCharacterSet;
}
+ (OFCharacterSet *)URLFragmentAllowedCharacterSet
{
of_once(&URLQueryOrFragmentAllowedCharacterSetOnce,
initURLQueryOrFragmentAllowedCharacterSet);
return URLQueryOrFragmentAllowedCharacterSet;
| > > > > > > > > | 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 |
+ (OFCharacterSet *)URLQueryAllowedCharacterSet
{
of_once(&URLQueryOrFragmentAllowedCharacterSetOnce,
initURLQueryOrFragmentAllowedCharacterSet);
return URLQueryOrFragmentAllowedCharacterSet;
}
+ (OFCharacterSet *)URLQueryKeyValueAllowedCharacterSet
{
static of_once_t onceControl = OF_ONCE_INIT;
of_once(&onceControl, initURLQueryKeyValueAllowedCharacterSet);
return URLQueryKeyValueAllowedCharacterSet;
}
+ (OFCharacterSet *)URLFragmentAllowedCharacterSet
{
of_once(&URLQueryOrFragmentAllowedCharacterSetOnce,
initURLQueryOrFragmentAllowedCharacterSet);
return URLQueryOrFragmentAllowedCharacterSet;
|
| ︙ | ︙ | |||
981 982 983 984 985 986 987 988 989 990 991 992 993 994 |
return _URLEncodedQuery.stringByURLDecoding;
}
- (OFString *)URLEncodedQuery
{
return _URLEncodedQuery;
}
- (OFString *)fragment
{
return _URLEncodedFragment.stringByURLDecoding;
}
- (OFString *)URLEncodedFragment
| > > > > > > > > > > > > > > > > > > > > > > > > > | 1031 1032 1033 1034 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 |
return _URLEncodedQuery.stringByURLDecoding;
}
- (OFString *)URLEncodedQuery
{
return _URLEncodedQuery;
}
- (OFDictionary OF_GENERIC(OFString *, OFString *) *)queryDictionary
{
void *pool = objc_autoreleasePoolPush();
OFArray *pairs = [_URLEncodedQuery componentsSeparatedByString: @"&"];
OFMutableDictionary *ret = [OFMutableDictionary
dictionaryWithCapacity: pairs.count];
for (OFString *pair in pairs) {
OFArray *parts = [pair componentsSeparatedByString: @"="];
if (parts.count != 2)
@throw [OFInvalidFormatException exception];
[ret setObject: [[parts objectAtIndex: 1] stringByURLDecoding]
forKey: [[parts objectAtIndex: 0] stringByURLDecoding]];
}
[ret makeImmutable];
[ret retain];
objc_autoreleasePoolPop(pool);
return [ret autorelease];
}
- (OFString *)fragment
{
return _URLEncodedFragment.stringByURLDecoding;
}
- (OFString *)URLEncodedFragment
|
| ︙ | ︙ |