Used -UTF8String to make the code less verbose.

programming-nu · timburks · Apr 15, 2017 · Apr 24, 2016 · Apr 25, 2016 · Apr 25, 2016
commit 7a2dc39c46dfe94f9a6cb5914d332a2836a081e9
diff --git a/objc/NSBundle+Nu.m b/objc/NSBundle+Nu.m
@@ -59,7 +59,7 @@ - (id) loadNuFile:(NSString *) nuFileName withContext:(NSMutableDictionary *) co
         if (string) {
             NuSymbolTable *symbolTable = [context objectForKey:SYMBOLS_KEY];
             id parser = [context lookupObjectForKey:[symbolTable symbolWithString:@"_parser"]];
-            id body = [parser parse:string asIfFromFilename:[fileName cStringUsingEncoding:NSUTF8StringEncoding]];
+            id body = [parser parse:string asIfFromFilename:[fileName UTF8String]];
             [body evalWithContext:context];
             return [symbolTable symbolWithString:@"t"];
         }

diff --git a/objc/NSData+Nu.m b/objc/NSData+Nu.m
@@ -48,11 +48,11 @@ + (NSData *) dataWithShellCommand:(NSString *) command standardInput:(id) input
         else {
             fullCommand = [NSString stringWithFormat:@"%@ > %@", command, outputFileName];
         }
-        const char *commandString = [fullCommand cStringUsingEncoding:NSUTF8StringEncoding];
+        const char *commandString = [fullCommand UTF8String];
         int result = system(commandString) >> 8;  // this needs an explanation
         if (!result)
             returnValue = [NSData dataWithContentsOfFile:outputFileName];
-        system([[NSString stringWithFormat:@"rm -f %@ %@", inputFileName, outputFileName] cStringUsingEncoding:NSUTF8StringEncoding]);
+        system([[NSString stringWithFormat:@"rm -f %@ %@", inputFileName, outputFileName] UTF8String]);
     }
     free(input_template);
     free(output_template);

diff --git a/objc/NSFileManager+Nu.m b/objc/NSFileManager+Nu.m
@@ -27,7 +27,7 @@ + (id) creationTimeForFileNamed:(NSString *) filename
 {
     if (!filename)
         return nil;
-    const char *path = [[filename stringByExpandingTildeInPath] cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *path = [[filename stringByExpandingTildeInPath] UTF8String];
     struct stat sb;
     int result = stat(path, &sb);
     if (result == -1) {
@@ -41,7 +41,7 @@ + (id) modificationTimeForFileNamed:(NSString *) filename
 {
     if (!filename)
         return nil;
-    const char *path = [[filename stringByExpandingTildeInPath] cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *path = [[filename stringByExpandingTildeInPath] UTF8String];
     struct stat sb;
     int result = stat(path, &sb);
     if (result == -1) {
@@ -54,7 +54,7 @@ + (int) directoryExistsNamed:(NSString *) filename
 {
     if (!filename)
         return NO;
-    const char *path = [[filename stringByExpandingTildeInPath] cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *path = [[filename stringByExpandingTildeInPath] UTF8String];
     struct stat sb;
     int result = stat(path, &sb);
     if (result == -1) {
@@ -67,7 +67,7 @@ + (int) fileExistsNamed:(NSString *) filename
 {
     if (!filename)
         return NO;
-    const char *path = [[filename stringByExpandingTildeInPath] cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *path = [[filename stringByExpandingTildeInPath] UTF8String];
     struct stat sb;
     int result = stat(path, &sb);
     if (result == -1) {

diff --git a/objc/NSObject+Nu.m b/objc/NSObject+Nu.m
@@ -99,7 +99,7 @@ - (NuSelectorCache *) lookupSymbol:(NuSymbol *)childSymbol
     if (!child) {
         child = [[[NuSelectorCache alloc] initWithSymbol:childSymbol parent:self] autorelease];
         NSString *selectorString = [child selectorName];
-        [child setSelector:sel_registerName([selectorString cStringUsingEncoding:NSUTF8StringEncoding])];
+        [child setSelector:sel_registerName([selectorString UTF8String])];
         [children setValue:child forKey:(id)childSymbol];
     }
     return child;
@@ -176,7 +176,7 @@ - (id) sendMessage:(id)cdr withContext:(NSMutableDictionary *)context
                 cursor = [cursor cdr];
             }
         }
-        // sel = sel_getUid([selectorString cStringUsingEncoding:NSUTF8StringEncoding]);
+        // sel = sel_getUid([selectorString UTF8String]);
         sel = [selectorCache selector];
     }
 
@@ -298,7 +298,7 @@ - (id) handleUnknownMessage:(id) message withContext:(NSMutableDictionary *) con
                 cursor = [cursor cdr];
             }
         }
-        // sel = sel_getUid([selectorString cStringUsingEncoding:NSUTF8StringEncoding]);
+        // sel = sel_getUid([selectorString UTF8String]);
         sel = [selectorCache selector];
     }
 
@@ -380,11 +380,11 @@ - (id) handleUnknownMessage:(id) message withContext:(NSMutableDictionary *) con
 
 - (id) valueForIvar:(NSString *) name
 {
-    Ivar v = class_getInstanceVariable([self class], [name cStringUsingEncoding:NSUTF8StringEncoding]);
+    Ivar v = class_getInstanceVariable([self class], [name UTF8String]);
 
 	if (!v) {
 		//check if a _variable was synthesized
-		v = class_getInstanceVariable([self class], [[@"_" stringByAppendingString:name]  cStringUsingEncoding:NSUTF8StringEncoding]);
+		v = class_getInstanceVariable([self class], [[@"_" stringByAppendingString:name]  UTF8String]);
 	}
 
 	if (!v) {
@@ -408,11 +408,11 @@ - (id) valueForIvar:(NSString *) name
 
 - (BOOL) hasValueForIvar:(NSString *) name
 {
-    Ivar v = class_getInstanceVariable([self class], [name cStringUsingEncoding:NSUTF8StringEncoding]);
+    Ivar v = class_getInstanceVariable([self class], [name UTF8String]);
 
 	if (!v) {
 		//check if a _variable was synthesized
-		v = class_getInstanceVariable([self class], [[@"_" stringByAppendingString:name]  cStringUsingEncoding:NSUTF8StringEncoding]);
+		v = class_getInstanceVariable([self class], [[@"_" stringByAppendingString:name]  UTF8String]);
 	}
 
 	if (!v) {
@@ -437,10 +437,10 @@ - (BOOL) hasValueForIvar:(NSString *) name
 
 - (void) setValue:(id) value forIvar:(NSString *)name
 {
-    Ivar v = class_getInstanceVariable([self class], [name cStringUsingEncoding:NSUTF8StringEncoding]);
+    Ivar v = class_getInstanceVariable([self class], [name UTF8String]);
 	if (!v) {
 		//check if a _variable was synthesized
-		v = class_getInstanceVariable([self class], [[@"_" stringByAppendingString:name]  cStringUsingEncoding:NSUTF8StringEncoding]);
+		v = class_getInstanceVariable([self class], [[@"_" stringByAppendingString:name]  UTF8String]);
 	}
 	if (!v) {
         NSMutableDictionary *sparseIvars = [self associatedObjectForKey:@"__nuivars"];
@@ -524,10 +524,10 @@ + (NSArray *) instanceVariableNames
 
 + (NSString *) signatureForIvar:(NSString *)name
 {
-    Ivar v = class_getInstanceVariable([self class], [name cStringUsingEncoding:NSUTF8StringEncoding]);
+    Ivar v = class_getInstanceVariable([self class], [name UTF8String]);
 	if (!v) {
 		//check if a _variable was synthesized
-		v = class_getInstanceVariable([self class], [[@"_" stringByAppendingString:name]  cStringUsingEncoding:NSUTF8StringEncoding]);
+		v = class_getInstanceVariable([self class], [[@"_" stringByAppendingString:name]  UTF8String]);
 	}
 	return [NSString stringWithCString:ivar_getTypeEncoding(v) encoding:NSUTF8StringEncoding];
 }
@@ -540,7 +540,7 @@ + (id) inheritedByClass:(NuClass *) newClass
 + (id) createSubclassNamed:(NSString *) subclassName
 {
     Class c = [self class];
-    const char *name = [subclassName cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *name = [subclassName UTF8String];
 
     // does the class already exist?
     Class s = objc_getClass(name);
@@ -580,7 +580,7 @@ + (BOOL) copyInstanceMethod:(NSString *) methodName fromClass:(NuClass *)prototy
 {
     Class thisClass = [self class];
     Class otherClass = [prototypeClass wrappedClass];
-    const char *method_name_str = [methodName cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *method_name_str = [methodName UTF8String];
     SEL selector = sel_registerName(method_name_str);
     BOOL result = nu_copyInstanceMethod(thisClass, otherClass, selector);
     return result;
@@ -665,7 +665,7 @@ - (id) set:(NuCell *) propertyList
         id value = [[cursor cdr] car];
         id label = ([key isKindOfClass:[NuSymbol class]] && [key isLabel]) ? [key labelName] : key;
         if ([label isEqualToString:@"action"] && [self respondsToSelector:@selector(setAction:)]) {
-            SEL selector = sel_registerName([value cStringUsingEncoding:NSUTF8StringEncoding]);
+            SEL selector = sel_registerName([value UTF8String]);
             [(id<NuCanSetAction>) self setAction:selector];
         }
         else {

diff --git a/objc/Nu.m b/objc/Nu.m
@@ -138,7 +138,7 @@ int NuMain(int argc, const char *argv[])
                 NSString *main_nu = [NSString stringWithContentsOfFile:main_path encoding:NSUTF8StringEncoding error:NULL];
                 if (main_nu) {
                     NuParser *parser = [Nu sharedParser];
-                    id script = [parser parse:main_nu asIfFromFilename:[main_nu cStringUsingEncoding:NSUTF8StringEncoding]];
+                    id script = [parser parse:main_nu asIfFromFilename:[main_nu UTF8String]];
                     [parser eval:script];
                     [parser release];
                     return 0;
@@ -214,7 +214,7 @@ int NuMain(int argc, const char *argv[])
         }
         @catch (NuException* nuException)
         {
-            printf("%s\n", [[nuException dump] cStringUsingEncoding:NSUTF8StringEncoding]);
+            printf("%s\n", [[nuException dump] UTF8String]);
         }
         @catch (id exception)
         {
@@ -402,7 +402,7 @@ + (BOOL) loadNuFile:(NSString *) fileName fromBundleWithIdentifier:(NSString *)
         NSString *fileNu = [NSString stringWithContentsOfFile:filePath encoding:NSUTF8StringEncoding error:NULL];
         if (fileNu) {
             NuParser *parser = [Nu sharedParser];
-            id script = [parser parse:fileNu asIfFromFilename:[filePath cStringUsingEncoding:NSUTF8StringEncoding]];
+            id script = [parser parse:fileNu asIfFromFilename:[filePath UTF8String]];
             if (!context) context = [parser context];
             [script evalWithContext:context];
             success = YES;

diff --git a/objc/NuBridge.m b/objc/NuBridge.m
@@ -576,7 +576,7 @@ int set_objc_value_from_nu_value(void *objc_value, id nu_value, const char *type
                 *((SEL *) objc_value) = 0;
                 return NO;
             }
-            const char *selectorName = [nu_value cStringUsingEncoding:NSUTF8StringEncoding];
+            const char *selectorName = [nu_value UTF8String];
             if (selectorName) {
                 *((SEL *) objc_value) = sel_registerName(selectorName);
                 return NO;
@@ -659,7 +659,7 @@ int set_objc_value_from_nu_value(void *objc_value, id nu_value, const char *type
                     char **array = (char **) malloc (array_size * sizeof(char *));
                     int i;
                     for (i = 0; i < array_size; i++) {
-                        array[i] = strdup([[nu_value objectAtIndex:i] cStringUsingEncoding:NSUTF8StringEncoding]);
+                        array[i] = strdup([[nu_value objectAtIndex:i] UTF8String]);
                     }
                     *((char ***) objc_value) = array;
                     return NO;
@@ -690,7 +690,7 @@ int set_objc_value_from_nu_value(void *objc_value, id nu_value, const char *type
 
         case '*':
         {
-            *((char **) objc_value) = (char*)[[nu_value stringValue] cStringUsingEncoding:NSUTF8StringEncoding];
+            *((char **) objc_value) = (char*)[[nu_value stringValue] UTF8String];
             return NO;
         }
 
@@ -1257,8 +1257,8 @@ static IMP construct_method_handler(SEL sel, NuBlock *block, const char *signatu
 
 id add_method_to_class(Class c, NSString *methodName, NSString *signature, NuBlock *block)
 {
-    const char *method_name_str = [methodName cStringUsingEncoding:NSUTF8StringEncoding];
-    const char *signature_str = [signature cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *method_name_str = [methodName UTF8String];
+    const char *signature_str = [signature UTF8String];
     SEL selector = sel_registerName(method_name_str);
 
     //NuSymbolTable *symbolTable = [[block context] objectForKey:SYMBOLS_KEY];
@@ -1568,7 +1568,7 @@ id help_add_method_to_class(Class classToExtend, id cdr, NSMutableDictionary *co
 
         if ((returnType == Nu__null) || ([argumentTypes length] < [argumentNames length])) {
             // look up the signature
-            SEL selector = sel_registerName([methodName cStringUsingEncoding:NSUTF8StringEncoding]);
+            SEL selector = sel_registerName([methodName UTF8String]);
             NSMethodSignature *methodSignature = [classToExtend instanceMethodSignatureForSelector:selector];
 
             if (!methodSignature)

diff --git a/objc/NuBridgeSupport.m b/objc/NuBridgeSupport.m
@@ -31,7 +31,7 @@ @implementation NuBridgeSupport
 + (void)importLibrary:(NSString *) libraryPath
 {
     //NSLog(@"importing library %@", libraryPath);
-    dlopen([libraryPath cStringUsingEncoding:NSUTF8StringEncoding], RTLD_LAZY | RTLD_GLOBAL);
+    dlopen([libraryPath UTF8String], RTLD_LAZY | RTLD_GLOBAL);
 }
 
 + (void)importFramework:(NSString *) framework fromPath:(NSString *) path intoDictionary:(NSMutableDictionary *) BridgeSupport

diff --git a/objc/NuBridgedConstant.m b/objc/NuBridgedConstant.m
@@ -14,15 +14,15 @@ @implementation NuBridgedConstant
 
 + (id) constantWithName:(NSString *) name signature:(NSString *) signature
 {
-    const char *constant_name = [name cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *constant_name = [name UTF8String];
     void *constant = dlsym(RTLD_DEFAULT, constant_name);
     if (!constant) {
         NSLog(@"%s", dlerror());
         NSLog(@"If you are using a release build, try rebuilding with the KEEP_PRIVATE_EXTERNS variable set.");
         NSLog(@"In Xcode, check the 'Preserve Private External Symbols' checkbox.");
         return nil;
     }
-    return get_nu_value_from_objc_value(constant, [signature cStringUsingEncoding:NSUTF8StringEncoding]);
+    return get_nu_value_from_objc_value(constant, [signature UTF8String]);
 }
 
 @end
diff --git a/objc/NuBridgedFunction.m b/objc/NuBridgedFunction.m
@@ -29,8 +29,8 @@ - (void) dealloc
 
 - (NuBridgedFunction *) initWithName:(NSString *)n signature:(NSString *)s
 {
-    name = strdup([n cStringUsingEncoding:NSUTF8StringEncoding]);
-    signature = strdup([s cStringUsingEncoding:NSUTF8StringEncoding]);
+    name = strdup([n UTF8String]);
+    signature = strdup([s UTF8String]);
     function = dlsym(RTLD_DEFAULT, name);
     if (!function) {
         [NSException raise:@"NuCantFindBridgedFunction"
@@ -43,7 +43,7 @@ - (NuBridgedFunction *) initWithName:(NSString *)n signature:(NSString *)s
 
 + (NuBridgedFunction *) functionWithName:(NSString *)name signature:(NSString *)signature
 {
-    const char *function_name = [name cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *function_name = [name UTF8String];
     void *function = dlsym(RTLD_DEFAULT, function_name);
     if (!function) {
         [NSException raise:@"NuCantFindBridgedFunction"

diff --git a/objc/NuClass.m b/objc/NuClass.m
@@ -29,7 +29,7 @@ @implementation NuClass
 
 + (NuClass *) classWithName:(NSString *)string
 {
-    const char *name = [string cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *name = [string UTF8String];
     Class class = objc_getClass(name);
     if (class) {
         return [[[self alloc] initWithClass:class] autorelease];
@@ -51,7 +51,7 @@ + (NuClass *) classWithClass:(Class) class
 
 - (id) initWithClassNamed:(NSString *) string
 {
-    const char *name = [string cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *name = [string UTF8String];
     Class class = objc_getClass(name);
     return [self initWithClass: class];
 }
@@ -159,7 +159,7 @@ - (NSComparisonResult) compare:(NuClass *) anotherClass
 
 - (NuMethod *) classMethodWithName:(NSString *) methodName
 {
-    const char *methodNameString = [methodName cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *methodNameString = [methodName UTF8String];
     NuMethod *method = Nu__null;
     unsigned int method_count;
     Method *method_list = class_copyMethodList(object_getClass([self wrappedClass]), &method_count);
@@ -175,7 +175,7 @@ - (NuMethod *) classMethodWithName:(NSString *) methodName
 
 - (NuMethod *) instanceMethodWithName:(NSString *) methodName
 {
-    const char *methodNameString = [methodName cStringUsingEncoding:NSUTF8StringEncoding];
+    const char *methodNameString = [methodName UTF8String];
     NuMethod *method = Nu__null;
     unsigned int method_count;
     Method *method_list = class_copyMethodList([self wrappedClass], &method_count);
@@ -204,7 +204,7 @@ - (id) addClassMethod:(NSString *)methodName signature:(NSString *)signature bod
 - (id) addInstanceVariable:(NSString *)variableName signature:(NSString *)signature
 {
     //NSLog(@"adding instance variable %@", variableName);
-    nu_class_addInstanceVariable_withSignature(c, [variableName cStringUsingEncoding:NSUTF8StringEncoding], [signature cStringUsingEncoding:NSUTF8StringEncoding]);
+    nu_class_addInstanceVariable_withSignature(c, [variableName UTF8String], [signature UTF8String]);
     return Nu__null;
 }
 
@@ -263,13 +263,13 @@ - (NSArray *) instanceVariableNames {
 - (BOOL) addPropertyWithName:(NSString *) name {
     const objc_property_attribute_t attributes[10];
     unsigned int attributeCount = 0;
-    return class_addProperty(c, [name cStringUsingEncoding:NSUTF8StringEncoding],
+    return class_addProperty(c, [name UTF8String],
                              attributes,
                              attributeCount);
 }
 
 - (NuProperty *) propertyWithName:(NSString *) name {
-    objc_property_t property = class_getProperty(c, [name cStringUsingEncoding:NSUTF8StringEncoding]);
+    objc_property_t property = class_getProperty(c, [name UTF8String]);
 
     return [NuProperty propertyWithProperty:(objc_property_t) property];
 }