0
@@ -149,6 +149,17 @@ extern id Nu__null;
0
     return [self callWithArguments:cdr context:calling_context];
0
 }
0
 
0
+id getObjectFromContext(id context, id symbol)
0
+{
0
+    while (IS_NOT_NULL(context)) {
0
+        id object = [context objectForKey:symbol];
0
+        if (object)
0
+            return object;
0
+        context = [context objectForKey:PARENT_KEY];
0
+    }
0
+    return nil;
0
+}
0
+
0
 - (id) evalWithArguments:(id)cdr context:(NSMutableDictionary *)calling_context self:(id)object
0
 {
0
     int numberOfArguments = [cdr length];
0
@@ -168,7 +179,8 @@ extern id Nu__null;
0
     //    NSLog(@"after copying, evaluation context %@ retain count %d", evaluation_context, [evaluation_context retainCount]);
0
     if (object) {
0
         NuSymbolTable *symbolTable = [evaluation_context objectForKey:SYMBOLS_KEY];
0
-        NuClass *c = [context objectForKey:[symbolTable symbolWithString:@"_class"]];
0
+        // look up one level for the _class value, but allow for it to be higher (in the perverse case of nested method declarations).
0
+        NuClass *c = getObjectFromContext([context objectForKey:PARENT_KEY], [symbolTable symbolWithString:@"_class"]);
0
         [evaluation_context setPossiblyNullObject:object forKey:[symbolTable symbolWithCString:"self"]];
0
         [evaluation_context setPossiblyNullObject:[NuSuper superWithObject:object ofClass:[c wrappedClass]] forKey:[symbolTable symbolWithCString:"super"]];
0
     }

0
@@ -1168,8 +1168,8 @@ id add_method_to_class(Class c, NSString *methodName, NSString *signature, NuBlo
0
     SEL selector = sel_register_name(method_name_str);
0
     #endif
0
 
0
-    NuSymbolTable *symbolTable = [[block context] objectForKey:SYMBOLS_KEY];
0
-    [[block context] setPossiblyNullObject:[[NuClass alloc] initWithClass:c] forKey:[symbolTable symbolWithCString:"_class"]];
0
+    //NuSymbolTable *symbolTable = [[block context] objectForKey:SYMBOLS_KEY];
0
+    //[[block context] setPossiblyNullObject:[[NuClass alloc] initWithClass:c] forKey:[symbolTable symbolWithCString:"_class"]];
0
 
0
     IMP imp = construct_method_handler(selector, block, signature_str);
0
     if (imp == NULL) {

0
@@ -162,35 +162,38 @@ limitations under the License.
0
 
0
 - (NSMutableString *) stringValue
0
 {
0
-    NuCell *cell = self;
0
+    NuCell *cursor = self;
0
     NSMutableString *result = [NSMutableString stringWithString:@"("];
0
-    bool first = true;
0
-    while (IS_NOT_NULL(cell)) {
0
-        if (first)
0
-            first = false;
0
-        else
0
+    int count = 0;
0
+    while (IS_NOT_NULL(cursor)) {
0
+        if (count > 0)
0
             [result appendString:@" "];
0
-        id mycar = [cell car];
0
-        if (nu_objectIsKindOfClass(mycar, [NuCell class])) {
0
-            [result appendString:[mycar stringValue]];
0
+        count++;
0
+        id item = [cursor car];
0
+        if (nu_objectIsKindOfClass(item, [NuCell class])) {
0
+            [result appendString:[item stringValue]];
0
         }
0
-        else if (mycar && (mycar != Nu__null)) {
0
-            if ([mycar respondsToSelector:@selector(escapedStringRepresentation)]) {
0
-                [result appendString:[mycar escapedStringRepresentation]];
0
+        else if (IS_NOT_NULL(item)) {
0
+            if ([item respondsToSelector:@selector(escapedStringRepresentation)]) {
0
+                [result appendString:[item escapedStringRepresentation]];
0
             }
0
             else {
0
-                [result appendString:[mycar description]];
0
+                [result appendString:[item description]];
0
             }
0
         }
0
         else {
0
             [result appendString:@"()"];
0
         }
0
-        cell = [cell cdr];
0
+        cursor = [cursor cdr];
0
         // check for dotted pairs
0
-        if (IS_NOT_NULL(cell) && !nu_objectIsKindOfClass(cell, [NuCell class])) {
0
+        if (IS_NOT_NULL(cursor) && !nu_objectIsKindOfClass(cursor, [NuCell class])) {
0
             [result appendString:@" . "];
0
-            [result appendString:[cell description]];
0
-            break;
0
+            if ([cursor respondsToSelector:@selector(escapedStringRepresentation)]) {
0
+                [result appendString:[cursor escapedStringRepresentation]];
0
+            }
0
+            else {
0
+                [result appendString:[cursor description]];
0
+            }            break;
0
         }
0
     }
0
     [result appendString:@")"];

0
@@ -651,12 +651,17 @@ limitations under the License.
0
     }
0
     else {
0
         #ifndef CLOSE_ON_VALUES
0
+        NuSymbolTable *symbolTable = [context objectForKey:SYMBOLS_KEY];
0
+        id classSymbol = [symbolTable symbolWithCString:"_class"];
0
         id searchContext = context;
0
         while (searchContext) {
0
             if ([searchContext objectForKey:symbol]) {
0
                 [searchContext setPossiblyNullObject:result forKey:symbol];
0
                 return result;
0
             }
0
+            else if ([searchContext objectForKey:classSymbol]) {
0
+                break;
0
+            }
0
             searchContext = [searchContext objectForKey:PARENT_KEY];
0
         }
0
         #endif