head 1.1; branch 1.1.1; access; symbols netbsd-11-0-RC4:1.1.1.3 netbsd-11-0-RC3:1.1.1.3 netbsd-11-0-RC2:1.1.1.3 netbsd-11-0-RC1:1.1.1.3 perseant-exfatfs-base-20250801:1.1.1.3 netbsd-11:1.1.1.3.0.10 netbsd-11-base:1.1.1.3 netbsd-10-1-RELEASE:1.1.1.3 perseant-exfatfs-base-20240630:1.1.1.3 perseant-exfatfs:1.1.1.3.0.8 perseant-exfatfs-base:1.1.1.3 netbsd-8-3-RELEASE:1.1.1.2 netbsd-9-4-RELEASE:1.1.1.2 netbsd-10-0-RELEASE:1.1.1.3 netbsd-10-0-RC6:1.1.1.3 netbsd-10-0-RC5:1.1.1.3 netbsd-10-0-RC4:1.1.1.3 netbsd-10-0-RC3:1.1.1.3 netbsd-10-0-RC2:1.1.1.3 netbsd-10-0-RC1:1.1.1.3 netbsd-10:1.1.1.3.0.6 netbsd-10-base:1.1.1.3 netbsd-9-3-RELEASE:1.1.1.2 cjep_sun2x:1.1.1.3.0.4 cjep_sun2x-base:1.1.1.3 cjep_staticlib_x-base1:1.1.1.3 netbsd-9-2-RELEASE:1.1.1.2 cjep_staticlib_x:1.1.1.3.0.2 cjep_staticlib_x-base:1.1.1.3 netbsd-9-1-RELEASE:1.1.1.2 phil-wifi-20200421:1.1.1.3 phil-wifi-20200411:1.1.1.3 phil-wifi-20200406:1.1.1.3 netbsd-8-2-RELEASE:1.1.1.2 netbsd-9-0-RELEASE:1.1.1.2 netbsd-9-0-RC2:1.1.1.2 netbsd-9-0-RC1:1.1.1.2 netbsd-9:1.1.1.2.0.18 netbsd-9-base:1.1.1.2 phil-wifi-20190609:1.1.1.2 netbsd-8-1-RELEASE:1.1.1.2 netbsd-8-1-RC1:1.1.1.2 pgoyette-compat-merge-20190127:1.1.1.2 pgoyette-compat-20190127:1.1.1.2 pgoyette-compat-20190118:1.1.1.2 pgoyette-compat-1226:1.1.1.2 pgoyette-compat-1126:1.1.1.2 pgoyette-compat-1020:1.1.1.2 pgoyette-compat-0930:1.1.1.2 pgoyette-compat-0906:1.1.1.2 netbsd-7-2-RELEASE:1.1.1.1 pgoyette-compat-0728:1.1.1.2 clang-337282:1.1.1.2 netbsd-8-0-RELEASE:1.1.1.2 phil-wifi:1.1.1.2.0.16 phil-wifi-base:1.1.1.2 pgoyette-compat-0625:1.1.1.2 netbsd-8-0-RC2:1.1.1.2 pgoyette-compat-0521:1.1.1.2 pgoyette-compat-0502:1.1.1.2 pgoyette-compat-0422:1.1.1.2 netbsd-8-0-RC1:1.1.1.2 pgoyette-compat-0415:1.1.1.2 pgoyette-compat-0407:1.1.1.2 pgoyette-compat-0330:1.1.1.2 pgoyette-compat-0322:1.1.1.2 pgoyette-compat-0315:1.1.1.2 netbsd-7-1-2-RELEASE:1.1.1.1 pgoyette-compat:1.1.1.2.0.14 pgoyette-compat-base:1.1.1.2 netbsd-7-1-1-RELEASE:1.1.1.1 clang-319952:1.1.1.2 matt-nb8-mediatek:1.1.1.2.0.12 matt-nb8-mediatek-base:1.1.1.2 clang-309604:1.1.1.2 perseant-stdc-iso10646:1.1.1.2.0.10 perseant-stdc-iso10646-base:1.1.1.2 netbsd-8:1.1.1.2.0.8 netbsd-8-base:1.1.1.2 prg-localcount2-base3:1.1.1.2 prg-localcount2-base2:1.1.1.2 prg-localcount2-base1:1.1.1.2 prg-localcount2:1.1.1.2.0.6 prg-localcount2-base:1.1.1.2 pgoyette-localcount-20170426:1.1.1.2 bouyer-socketcan-base1:1.1.1.2 pgoyette-localcount-20170320:1.1.1.2 netbsd-7-1:1.1.1.1.0.14 netbsd-7-1-RELEASE:1.1.1.1 netbsd-7-1-RC2:1.1.1.1 clang-294123:1.1.1.2 netbsd-7-nhusb-base-20170116:1.1.1.1 bouyer-socketcan:1.1.1.2.0.4 bouyer-socketcan-base:1.1.1.2 clang-291444:1.1.1.2 pgoyette-localcount-20170107:1.1.1.2 netbsd-7-1-RC1:1.1.1.1 pgoyette-localcount-20161104:1.1.1.2 netbsd-7-0-2-RELEASE:1.1.1.1 localcount-20160914:1.1.1.2 netbsd-7-nhusb:1.1.1.1.0.12 netbsd-7-nhusb-base:1.1.1.1 clang-280599:1.1.1.2 pgoyette-localcount-20160806:1.1.1.2 pgoyette-localcount-20160726:1.1.1.2 pgoyette-localcount:1.1.1.2.0.2 pgoyette-localcount-base:1.1.1.2 netbsd-7-0-1-RELEASE:1.1.1.1 clang-261930:1.1.1.2 netbsd-7-0:1.1.1.1.0.10 netbsd-7-0-RELEASE:1.1.1.1 netbsd-7-0-RC3:1.1.1.1 netbsd-7-0-RC2:1.1.1.1 netbsd-7-0-RC1:1.1.1.1 clang-237755:1.1.1.1 clang-232565:1.1.1.1 clang-227398:1.1.1.1 tls-maxphys-base:1.1.1.1 tls-maxphys:1.1.1.1.0.8 netbsd-7:1.1.1.1.0.6 netbsd-7-base:1.1.1.1 clang-215315:1.1.1.1 clang-209886:1.1.1.1 yamt-pagecache:1.1.1.1.0.4 yamt-pagecache-base9:1.1.1.1 tls-earlyentropy:1.1.1.1.0.2 tls-earlyentropy-base:1.1.1.1 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.1 riastradh-drm2-base3:1.1.1.1 clang-202566:1.1.1.1 clang-201163:1.1.1.1 clang-199312:1.1.1.1 clang-198450:1.1.1.1 clang-196603:1.1.1.1 clang-195771:1.1.1.1 LLVM:1.1.1; locks; strict; comment @# @; 1.1 date 2013.11.28.14.14.54; author joerg; state Exp; branches 1.1.1.1; next ; commitid ow8OybrawrB1f3fx; 1.1.1.1 date 2013.11.28.14.14.54; author joerg; state Exp; branches 1.1.1.1.4.1 1.1.1.1.8.1; next 1.1.1.2; commitid ow8OybrawrB1f3fx; 1.1.1.2 date 2016.02.27.22.08.34; author joerg; state Exp; branches 1.1.1.2.16.1; next 1.1.1.3; commitid tIimz3oDlh1NpBWy; 1.1.1.3 date 2019.11.13.22.19.31; author joerg; state dead; branches; next ; commitid QD8YATxuNG34YJKB; 1.1.1.1.4.1 date 2013.11.28.14.14.54; author yamt; state dead; branches; next 1.1.1.1.4.2; commitid WSrDtL5nYAUyiyBx; 1.1.1.1.4.2 date 2014.05.22.16.18.33; author yamt; state Exp; branches; next ; commitid WSrDtL5nYAUyiyBx; 1.1.1.1.8.1 date 2013.11.28.14.14.54; author tls; state dead; branches; next 1.1.1.1.8.2; commitid jTnpym9Qu0o4R1Nx; 1.1.1.1.8.2 date 2014.08.19.23.47.33; author tls; state Exp; branches; next ; commitid jTnpym9Qu0o4R1Nx; 1.1.1.2.16.1 date 2020.04.13.07.46.41; author martin; state dead; branches; next ; commitid X01YhRUPVUDaec4C; desc @@ 1.1 log @Initial revision @ text @// RUN: rm -rf %t // RUN: %clang_cc1 -objcmt-migrate-literals -objcmt-migrate-subscripting -mt-migrate-directory %t %s -x objective-c -triple x86_64-apple-darwin11 // RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s.result typedef signed char BOOL; #define nil ((void*) 0) typedef const struct __CFString * CFStringRef; @@interface NSObject + (id)alloc; @@end @@protocol NSCopying @@end @@interface NSString : NSObject + (id)stringWithString:(NSString *)string; - (id)initWithString:(NSString *)aString; @@end @@interface NSArray : NSObject - (id)objectAtIndex:(unsigned long)index; @@end @@interface NSArray (NSExtendedArray) - (id)objectAtIndexedSubscript:(unsigned)idx; @@end @@interface NSArray (NSArrayCreation) + (id)array; + (id)arrayWithObject:(id)anObject; + (id)arrayWithObjects:(const id [])objects count:(unsigned long)cnt; + (id)arrayWithObjects:(id)firstObj, ...; + (id)arrayWithArray:(NSArray *)array; - (id)initWithObjects:(const id [])objects count:(unsigned long)cnt; - (id)initWithObjects:(id)firstObj, ...; - (id)initWithArray:(NSArray *)array; @@end @@interface NSMutableArray : NSArray - (void)replaceObjectAtIndex:(unsigned long)index withObject:(id)anObject; @@end @@interface NSMutableArray (NSExtendedMutableArray) - (void)setObject:(id)obj atIndexedSubscript:(unsigned)idx; @@end @@interface NSDictionary : NSObject - (id)objectForKey:(id)aKey; @@end @@interface NSDictionary (NSExtendedDictionary) - (id)objectForKeyedSubscript:(id)key; @@end @@interface NSDictionary (NSDictionaryCreation) + (id)dictionary; + (id)dictionaryWithObject:(id)object forKey:(id)key; + (id)dictionaryWithObjects:(const id [])objects forKeys:(const id [])keys count:(unsigned long)cnt; + (id)dictionaryWithObjectsAndKeys:(id)firstObject, ...; + (id)dictionaryWithDictionary:(NSDictionary *)dict; + (id)dictionaryWithObjects:(NSArray *)objects forKeys:(NSArray *)keys; - (id)initWithObjects:(const id [])objects forKeys:(const id [])keys count:(unsigned long)cnt; - (id)initWithObjectsAndKeys:(id)firstObject, ...; - (id)initWithDictionary:(NSDictionary *)otherDictionary; - (id)initWithObjects:(NSArray *)objects forKeys:(NSArray *)keys; @@end @@interface NSMutableDictionary : NSDictionary - (void)setObject:(id)anObject forKey:(id)aKey; @@end @@interface NSMutableDictionary (NSExtendedMutableDictionary) - (void)setObject:(id)obj forKeyedSubscript:(id )key; @@end @@interface NSNumber : NSObject @@end @@interface NSNumber (NSNumberCreation) + (NSNumber *)numberWithInt:(int)value; @@end #define M(x) (x) #define PAIR(x) @@#x, [NSNumber numberWithInt:(x)] #define TWO(x) ((x), (x)) @@interface I { NSArray *ivarArr; } @@end @@implementation I -(void) foo { NSString *str; NSArray *arr; NSDictionary *dict; arr = @@[]; arr = @@[str]; arr = @@[str, str]; dict = @@{}; dict = @@{str: arr}; dict = @@{@@"key1": @@"value1", @@"key2": @@"value2"}; dict = [NSDictionary dictionaryWithObjectsAndKeys: PAIR(1), PAIR(2), nil]; dict = [NSDictionary dictionaryWithObjectsAndKeys: @@"value1", @@"key1", #ifdef BLAH @@"value2", @@"key2", #else @@"value3", @@"key3", #endif nil ]; id o = arr[2]; o = dict[@@"key"]; o = TWO(dict[@@"key"]); o = @@{@@"key": @@{}}; NSMutableArray *marr = 0; NSMutableDictionary *mdict = 0; marr[2] = @@"val"; mdict[@@"key"] = @@"value"; marr[2] = arr[4]; mdict[@@"key"] = dict[@@"key2"]; [mdict setObject:dict[@@"key2"] forKey: #if 1 @@"key1" #else @@"key2" #endif ]; mdict[@@"key"] = [dict objectForKey: #if 2 @@"key3" #else @@"key4" #endif ]; mdict[[dict objectForKey: #if 3 @@"key5" #else @@"key6" #endif ]] = @@"value"; mdict[dict[@@"key2"]] = @@"val"; mdict[dict[@@[@@"arrkey"]]] = dict[@@"key1"]; __strong NSArray **parr = 0; o = (*parr)[2]; void *hd; o = ((NSArray*)hd)[2]; o = ivarArr[2]; dict = @@{@@"A": @@"1", arr[2]: @@[]}; dict = [NSDictionary dictionaryWithObjects:@@[@@"1", @@"2"] forKeys:arr]; dict = @@{@@"A": @@"1", @@"B": @@"2"}; dict = @@{@@"A": @@[], @@"B": @@[]}; } @@end extern const CFStringRef globStr; void test1(NSString *str) { NSDictionary *dict = @@{(id)globStr: str}; dict = @@{str: (id)globStr}; dict = @@{(id)globStr: str}; dict = @@{str: (id)globStr}; NSArray *arr = @@[(id)globStr, (id)globStr]; arr = @@[str, (id)globStr]; arr = @@[(id)globStr, str]; arr = @@[(id)globStr]; } @@interface Custom : NSObject - (id)objectAtIndex:(unsigned long)index; @@end @@interface Custom (Extended) - (id)objectAtIndexedSubscript:(unsigned)idx; @@end @@interface MutableCustom : Custom - (void)replaceObjectAtIndex:(unsigned long)index withObject:(id)anObject; @@end @@interface MutableCustom (Extended) - (void)setObject:(id)obj atIndexedSubscript:(unsigned)idx; @@end @@interface CustomUnavail : NSObject - (id)objectAtIndex:(unsigned long)index; @@end @@interface CustomUnavail (Extended) - (id)objectAtIndexedSubscript:(unsigned)idx __attribute__((unavailable)); @@end @@interface MutableCustomUnavail : CustomUnavail - (void)replaceObjectAtIndex:(unsigned long)index withObject:(id)anObject; @@end @@interface MutableCustomUnavail (Extended) - (void)setObject:(id)obj atIndexedSubscript:(unsigned)idx __attribute__((unavailable)); @@end void test2() { MutableCustom *mutc; id o = mutc[4]; mutc[2] = @@"val"; MutableCustomUnavail *mutcunaval; o = [mutcunaval objectAtIndex:4]; [mutcunaval replaceObjectAtIndex:2 withObject:@@"val"]; } @@interface NSLocale : NSObject + (id)systemLocale; + (id)currentLocale; - (id)objectForKey:(id)key; @@end void test3(id key) { id o = [[NSLocale currentLocale] objectForKey:key]; } @ 1.1.1.1 log @Import Clang 3.4rc1 r195771. @ text @@ 1.1.1.2 log @Import Clang 3.8.0rc3 r261930. @ text @a90 1 #define TWO_SEP(x,y) ((x), (y)) a120 1 o = TWO_SEP(dict[@@"key"], arr[2]); @ 1.1.1.2.16.1 log @Mostly merge changes from HEAD upto 20200411 @ text @@ 1.1.1.3 log @Mark old LLVM instance as dead. @ text @@ 1.1.1.1.8.1 log @file objcmt-subscripting-literals.m.result was added on branch tls-maxphys on 2014-08-19 23:47:33 +0000 @ text @d1 228 @ 1.1.1.1.8.2 log @Rebase to HEAD as of a few days ago. @ text @a0 228 // RUN: rm -rf %t // RUN: %clang_cc1 -objcmt-migrate-literals -objcmt-migrate-subscripting -mt-migrate-directory %t %s -x objective-c -triple x86_64-apple-darwin11 // RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s.result typedef signed char BOOL; #define nil ((void*) 0) typedef const struct __CFString * CFStringRef; @@interface NSObject + (id)alloc; @@end @@protocol NSCopying @@end @@interface NSString : NSObject + (id)stringWithString:(NSString *)string; - (id)initWithString:(NSString *)aString; @@end @@interface NSArray : NSObject - (id)objectAtIndex:(unsigned long)index; @@end @@interface NSArray (NSExtendedArray) - (id)objectAtIndexedSubscript:(unsigned)idx; @@end @@interface NSArray (NSArrayCreation) + (id)array; + (id)arrayWithObject:(id)anObject; + (id)arrayWithObjects:(const id [])objects count:(unsigned long)cnt; + (id)arrayWithObjects:(id)firstObj, ...; + (id)arrayWithArray:(NSArray *)array; - (id)initWithObjects:(const id [])objects count:(unsigned long)cnt; - (id)initWithObjects:(id)firstObj, ...; - (id)initWithArray:(NSArray *)array; @@end @@interface NSMutableArray : NSArray - (void)replaceObjectAtIndex:(unsigned long)index withObject:(id)anObject; @@end @@interface NSMutableArray (NSExtendedMutableArray) - (void)setObject:(id)obj atIndexedSubscript:(unsigned)idx; @@end @@interface NSDictionary : NSObject - (id)objectForKey:(id)aKey; @@end @@interface NSDictionary (NSExtendedDictionary) - (id)objectForKeyedSubscript:(id)key; @@end @@interface NSDictionary (NSDictionaryCreation) + (id)dictionary; + (id)dictionaryWithObject:(id)object forKey:(id)key; + (id)dictionaryWithObjects:(const id [])objects forKeys:(const id [])keys count:(unsigned long)cnt; + (id)dictionaryWithObjectsAndKeys:(id)firstObject, ...; + (id)dictionaryWithDictionary:(NSDictionary *)dict; + (id)dictionaryWithObjects:(NSArray *)objects forKeys:(NSArray *)keys; - (id)initWithObjects:(const id [])objects forKeys:(const id [])keys count:(unsigned long)cnt; - (id)initWithObjectsAndKeys:(id)firstObject, ...; - (id)initWithDictionary:(NSDictionary *)otherDictionary; - (id)initWithObjects:(NSArray *)objects forKeys:(NSArray *)keys; @@end @@interface NSMutableDictionary : NSDictionary - (void)setObject:(id)anObject forKey:(id)aKey; @@end @@interface NSMutableDictionary (NSExtendedMutableDictionary) - (void)setObject:(id)obj forKeyedSubscript:(id )key; @@end @@interface NSNumber : NSObject @@end @@interface NSNumber (NSNumberCreation) + (NSNumber *)numberWithInt:(int)value; @@end #define M(x) (x) #define PAIR(x) @@#x, [NSNumber numberWithInt:(x)] #define TWO(x) ((x), (x)) @@interface I { NSArray *ivarArr; } @@end @@implementation I -(void) foo { NSString *str; NSArray *arr; NSDictionary *dict; arr = @@[]; arr = @@[str]; arr = @@[str, str]; dict = @@{}; dict = @@{str: arr}; dict = @@{@@"key1": @@"value1", @@"key2": @@"value2"}; dict = [NSDictionary dictionaryWithObjectsAndKeys: PAIR(1), PAIR(2), nil]; dict = [NSDictionary dictionaryWithObjectsAndKeys: @@"value1", @@"key1", #ifdef BLAH @@"value2", @@"key2", #else @@"value3", @@"key3", #endif nil ]; id o = arr[2]; o = dict[@@"key"]; o = TWO(dict[@@"key"]); o = @@{@@"key": @@{}}; NSMutableArray *marr = 0; NSMutableDictionary *mdict = 0; marr[2] = @@"val"; mdict[@@"key"] = @@"value"; marr[2] = arr[4]; mdict[@@"key"] = dict[@@"key2"]; [mdict setObject:dict[@@"key2"] forKey: #if 1 @@"key1" #else @@"key2" #endif ]; mdict[@@"key"] = [dict objectForKey: #if 2 @@"key3" #else @@"key4" #endif ]; mdict[[dict objectForKey: #if 3 @@"key5" #else @@"key6" #endif ]] = @@"value"; mdict[dict[@@"key2"]] = @@"val"; mdict[dict[@@[@@"arrkey"]]] = dict[@@"key1"]; __strong NSArray **parr = 0; o = (*parr)[2]; void *hd; o = ((NSArray*)hd)[2]; o = ivarArr[2]; dict = @@{@@"A": @@"1", arr[2]: @@[]}; dict = [NSDictionary dictionaryWithObjects:@@[@@"1", @@"2"] forKeys:arr]; dict = @@{@@"A": @@"1", @@"B": @@"2"}; dict = @@{@@"A": @@[], @@"B": @@[]}; } @@end extern const CFStringRef globStr; void test1(NSString *str) { NSDictionary *dict = @@{(id)globStr: str}; dict = @@{str: (id)globStr}; dict = @@{(id)globStr: str}; dict = @@{str: (id)globStr}; NSArray *arr = @@[(id)globStr, (id)globStr]; arr = @@[str, (id)globStr]; arr = @@[(id)globStr, str]; arr = @@[(id)globStr]; } @@interface Custom : NSObject - (id)objectAtIndex:(unsigned long)index; @@end @@interface Custom (Extended) - (id)objectAtIndexedSubscript:(unsigned)idx; @@end @@interface MutableCustom : Custom - (void)replaceObjectAtIndex:(unsigned long)index withObject:(id)anObject; @@end @@interface MutableCustom (Extended) - (void)setObject:(id)obj atIndexedSubscript:(unsigned)idx; @@end @@interface CustomUnavail : NSObject - (id)objectAtIndex:(unsigned long)index; @@end @@interface CustomUnavail (Extended) - (id)objectAtIndexedSubscript:(unsigned)idx __attribute__((unavailable)); @@end @@interface MutableCustomUnavail : CustomUnavail - (void)replaceObjectAtIndex:(unsigned long)index withObject:(id)anObject; @@end @@interface MutableCustomUnavail (Extended) - (void)setObject:(id)obj atIndexedSubscript:(unsigned)idx __attribute__((unavailable)); @@end void test2() { MutableCustom *mutc; id o = mutc[4]; mutc[2] = @@"val"; MutableCustomUnavail *mutcunaval; o = [mutcunaval objectAtIndex:4]; [mutcunaval replaceObjectAtIndex:2 withObject:@@"val"]; } @@interface NSLocale : NSObject + (id)systemLocale; + (id)currentLocale; - (id)objectForKey:(id)key; @@end void test3(id key) { id o = [[NSLocale currentLocale] objectForKey:key]; } @ 1.1.1.1.4.1 log @file objcmt-subscripting-literals.m.result was added on branch yamt-pagecache on 2014-05-22 16:18:33 +0000 @ text @d1 228 @ 1.1.1.1.4.2 log @sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") @ text @a0 228 // RUN: rm -rf %t // RUN: %clang_cc1 -objcmt-migrate-literals -objcmt-migrate-subscripting -mt-migrate-directory %t %s -x objective-c -triple x86_64-apple-darwin11 // RUN: c-arcmt-test -mt-migrate-directory %t | arcmt-test -verify-transformed-files %s.result // RUN: %clang_cc1 -triple x86_64-apple-darwin10 -fsyntax-only -x objective-c %s.result typedef signed char BOOL; #define nil ((void*) 0) typedef const struct __CFString * CFStringRef; @@interface NSObject + (id)alloc; @@end @@protocol NSCopying @@end @@interface NSString : NSObject + (id)stringWithString:(NSString *)string; - (id)initWithString:(NSString *)aString; @@end @@interface NSArray : NSObject - (id)objectAtIndex:(unsigned long)index; @@end @@interface NSArray (NSExtendedArray) - (id)objectAtIndexedSubscript:(unsigned)idx; @@end @@interface NSArray (NSArrayCreation) + (id)array; + (id)arrayWithObject:(id)anObject; + (id)arrayWithObjects:(const id [])objects count:(unsigned long)cnt; + (id)arrayWithObjects:(id)firstObj, ...; + (id)arrayWithArray:(NSArray *)array; - (id)initWithObjects:(const id [])objects count:(unsigned long)cnt; - (id)initWithObjects:(id)firstObj, ...; - (id)initWithArray:(NSArray *)array; @@end @@interface NSMutableArray : NSArray - (void)replaceObjectAtIndex:(unsigned long)index withObject:(id)anObject; @@end @@interface NSMutableArray (NSExtendedMutableArray) - (void)setObject:(id)obj atIndexedSubscript:(unsigned)idx; @@end @@interface NSDictionary : NSObject - (id)objectForKey:(id)aKey; @@end @@interface NSDictionary (NSExtendedDictionary) - (id)objectForKeyedSubscript:(id)key; @@end @@interface NSDictionary (NSDictionaryCreation) + (id)dictionary; + (id)dictionaryWithObject:(id)object forKey:(id)key; + (id)dictionaryWithObjects:(const id [])objects forKeys:(const id [])keys count:(unsigned long)cnt; + (id)dictionaryWithObjectsAndKeys:(id)firstObject, ...; + (id)dictionaryWithDictionary:(NSDictionary *)dict; + (id)dictionaryWithObjects:(NSArray *)objects forKeys:(NSArray *)keys; - (id)initWithObjects:(const id [])objects forKeys:(const id [])keys count:(unsigned long)cnt; - (id)initWithObjectsAndKeys:(id)firstObject, ...; - (id)initWithDictionary:(NSDictionary *)otherDictionary; - (id)initWithObjects:(NSArray *)objects forKeys:(NSArray *)keys; @@end @@interface NSMutableDictionary : NSDictionary - (void)setObject:(id)anObject forKey:(id)aKey; @@end @@interface NSMutableDictionary (NSExtendedMutableDictionary) - (void)setObject:(id)obj forKeyedSubscript:(id )key; @@end @@interface NSNumber : NSObject @@end @@interface NSNumber (NSNumberCreation) + (NSNumber *)numberWithInt:(int)value; @@end #define M(x) (x) #define PAIR(x) @@#x, [NSNumber numberWithInt:(x)] #define TWO(x) ((x), (x)) @@interface I { NSArray *ivarArr; } @@end @@implementation I -(void) foo { NSString *str; NSArray *arr; NSDictionary *dict; arr = @@[]; arr = @@[str]; arr = @@[str, str]; dict = @@{}; dict = @@{str: arr}; dict = @@{@@"key1": @@"value1", @@"key2": @@"value2"}; dict = [NSDictionary dictionaryWithObjectsAndKeys: PAIR(1), PAIR(2), nil]; dict = [NSDictionary dictionaryWithObjectsAndKeys: @@"value1", @@"key1", #ifdef BLAH @@"value2", @@"key2", #else @@"value3", @@"key3", #endif nil ]; id o = arr[2]; o = dict[@@"key"]; o = TWO(dict[@@"key"]); o = @@{@@"key": @@{}}; NSMutableArray *marr = 0; NSMutableDictionary *mdict = 0; marr[2] = @@"val"; mdict[@@"key"] = @@"value"; marr[2] = arr[4]; mdict[@@"key"] = dict[@@"key2"]; [mdict setObject:dict[@@"key2"] forKey: #if 1 @@"key1" #else @@"key2" #endif ]; mdict[@@"key"] = [dict objectForKey: #if 2 @@"key3" #else @@"key4" #endif ]; mdict[[dict objectForKey: #if 3 @@"key5" #else @@"key6" #endif ]] = @@"value"; mdict[dict[@@"key2"]] = @@"val"; mdict[dict[@@[@@"arrkey"]]] = dict[@@"key1"]; __strong NSArray **parr = 0; o = (*parr)[2]; void *hd; o = ((NSArray*)hd)[2]; o = ivarArr[2]; dict = @@{@@"A": @@"1", arr[2]: @@[]}; dict = [NSDictionary dictionaryWithObjects:@@[@@"1", @@"2"] forKeys:arr]; dict = @@{@@"A": @@"1", @@"B": @@"2"}; dict = @@{@@"A": @@[], @@"B": @@[]}; } @@end extern const CFStringRef globStr; void test1(NSString *str) { NSDictionary *dict = @@{(id)globStr: str}; dict = @@{str: (id)globStr}; dict = @@{(id)globStr: str}; dict = @@{str: (id)globStr}; NSArray *arr = @@[(id)globStr, (id)globStr]; arr = @@[str, (id)globStr]; arr = @@[(id)globStr, str]; arr = @@[(id)globStr]; } @@interface Custom : NSObject - (id)objectAtIndex:(unsigned long)index; @@end @@interface Custom (Extended) - (id)objectAtIndexedSubscript:(unsigned)idx; @@end @@interface MutableCustom : Custom - (void)replaceObjectAtIndex:(unsigned long)index withObject:(id)anObject; @@end @@interface MutableCustom (Extended) - (void)setObject:(id)obj atIndexedSubscript:(unsigned)idx; @@end @@interface CustomUnavail : NSObject - (id)objectAtIndex:(unsigned long)index; @@end @@interface CustomUnavail (Extended) - (id)objectAtIndexedSubscript:(unsigned)idx __attribute__((unavailable)); @@end @@interface MutableCustomUnavail : CustomUnavail - (void)replaceObjectAtIndex:(unsigned long)index withObject:(id)anObject; @@end @@interface MutableCustomUnavail (Extended) - (void)setObject:(id)obj atIndexedSubscript:(unsigned)idx __attribute__((unavailable)); @@end void test2() { MutableCustom *mutc; id o = mutc[4]; mutc[2] = @@"val"; MutableCustomUnavail *mutcunaval; o = [mutcunaval objectAtIndex:4]; [mutcunaval replaceObjectAtIndex:2 withObject:@@"val"]; } @@interface NSLocale : NSObject + (id)systemLocale; + (id)currentLocale; - (id)objectForKey:(id)key; @@end void test3(id key) { id o = [[NSLocale currentLocale] objectForKey:key]; } @