0
@@ -1085,8 +1085,10 @@ static void objc_calling_nu_method_handler(ffi_cif* cif, void* returnvalue, void
0
     //NSLog(@"in nu method handler, putting result %@ in %x with type %s", [result stringValue], (int) returnvalue, ((char **)userdata)[0]);
0
     char *resultType = (((char **)userdata)[0])+1;// skip the first character, it's a flag
0
     set_objc_value_from_nu_value(returnvalue, result, resultType);
0
-    if (((char **)userdata)[0][0] == '!')
0
+    if (((char **)userdata)[0][0] == '!') {
0
+        //NSLog(@"retaining result for object %@, count = %d", *(id *)returnvalue, [*(id *)returnvalue retainCount]);
0
         [*((id *)returnvalue) retain];
0
+    }
0
 
0
     [arguments release];
0
 
0
@@ -1108,10 +1110,14 @@ IMP construct_method_handler(SEL sel, NuBlock *block, const char *signature)
0
     const char *methodName = sel_get_name(sel);
0
     #endif
0
     BOOL returnsRetainedResult = NO;
0
-    if ((strlen(methodName) >= 4)                 // retain the result of any method
0
-        && !strncmp("init", methodName, 4)        // whose name begins with "init"
0
-        && strcmp("initialize", methodName)       // unless it is named "initialize"
0
-        )
0
+
0
+    if ((!strcmp(methodName, "alloc")) ||
0
+        (!strcmp(methodName, "allocWithZone:")) ||
0
+        (!strcmp(methodName, "copy")) ||
0
+        (!strcmp(methodName, "copyWithZone:")) ||
0
+        (!strcmp(methodName, "mutableCopy")) ||
0
+        (!strcmp(methodName, "mutableCopyWithZone:")) ||
0
+        (!strcmp(methodName, "new")))
0
         returnsRetainedResult = YES;
0
     if (returnsRetainedResult)
0
         sprintf(userdata[0], "!%s", return_type_string);

0
@@ -424,6 +424,33 @@ extern id Nu__null;
0
 
0
 @end
0
 
0
+@implementation NSData(Nu)
0
+
0
+#ifndef IPHONE
0
+// Read the output of a shell command into an NSData object and return the object.
0
++ (NSData *) dataWithShellCommand:(NSString *) command
0
+{
0
+    NSTask *task = [NSTask new];
0
+    [task setLaunchPath:@"/bin/sh"];
0
+    #ifdef DARWIN
0
+    NSPipe *input = [NSPipe new];
0
+    [task setStandardInput:input];
0
+    NSPipe *output = [NSPipe new];
0
+    #else
0
+    NSPipe *input = [NSPipe pipe];
0
+    [task setStandardInput:input];
0
+    NSPipe *output = [NSPipe pipe];
0
+    #endif
0
+    [task setStandardOutput:output];
0
+    [task launch];
0
+    [[input fileHandleForWriting] writeData:[command dataUsingEncoding:NSUTF8StringEncoding]];
0
+    [[input fileHandleForWriting] closeFile];
0
+    NSData *data = [[[task standardOutput] fileHandleForReading] readDataToEndOfFile];
0
+    return data;
0
+}
0
+#endif
0
+@end
0
+
0
 @implementation NSNumber(Nu)
0
 
0
 - (id) times:(id) block

0
@@ -264,6 +264,9 @@ void NuInit()
0
         // Their implementations are identical; this avoids code duplication.
0
         transplant_nu_methods([NSProxy class], [NSObject class]);
0
 
0
+        void nu_swizzleContainerClasses();
0
+        nu_swizzleContainerClasses();
0
+
0
         // Stop NSView from complaining when we retain alloc-ed views.
0
         Class NSView = NSClassFromString(@"NSView");
0
         [NSView exchangeInstanceMethod:@selector(retain) withMethod:@selector(nuRetain)];
0
@@ -273,7 +276,7 @@ void NuInit()
0
         nu_initProtocols();
0
         // if you don't like making Protocol a subclass of NSObject (see nu_initProtocols), you can do this instead.
0
         // transplant_nu_methods([Protocol class], [NSObject class]);
0
-        
0
+
0
         #ifndef MININUSH
0
         // Load some standard files
0
         // Warning: since these loads are performed without a context, the non-global symbols defined in them
0
@@ -285,7 +288,7 @@ void NuInit()
0
         [Nu loadNuFile:@"help"          fromBundleWithIdentifier:@"nu.programming.framework" withContext:nil];
0
         #endif
0
         #endif
0
-        
0
+
0
         #else
0
         [[Nu parser] parseEval:@"(load \"nu\")"];
0
         #endif

0
@@ -16,8 +16,6 @@ See the License for the specific language governing permissions and
0
 limitations under the License.
0
 */
0
 
0
-#if 0
0
-// this code is no longer necessary
0
 
0
 #import <Foundation/Foundation.h>
0
 #import "class.h"
0
@@ -85,4 +83,3 @@ void nu_swizzleContainerClasses()
0
     [NSCFSet exchangeInstanceMethod:@selector(addObject:) withMethod:@selector(nuAddObject:)];
0
     [pool release];
0
 }
0
-#endif