Various bug fixes.

logancollins · Aug 8, 2012 · e04ddcb · e04ddcb
1 parent e8e770f
commit e04ddcb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 38 deletions.
diff --git a/Mocha/MochaRuntime.m b/Mocha/MochaRuntime.m
@@ -1028,50 +1028,32 @@ JSValueRef Mocha_getProperty(JSContextRef ctx, JSObjectRef object, JSStringRef p
 
         // Enums
         else if ([symbol isKindOfClass:[MOBridgeSupportEnum class]]) {
-            NSNumber *value = [(MOBridgeSupportEnum *)symbol value];
-
             double doubleValue = 0;
-
+            NSNumber *value = [(MOBridgeSupportEnum *)symbol value];
 #if __LP64__
             NSNumber *value64 = [(MOBridgeSupportEnum *)symbol value64];
-            if (value != nil) {
+            if (value64 != nil) {
-                doubleValue = [value doubleValue];
-            }
-            else if (value64 != nil) {
                 doubleValue = [value doubleValue];
             }
             else {
-                NSException *e = [NSException exceptionWithName:MORuntimeException reason:[NSString stringWithFormat:@"No value for enum: %@", symbol] userInfo:nil];
+#endif
-                if (exception != NULL) {
+                if (value != nil) {
-                    *exception = [runtime JSValueForObject:e];
+                    doubleValue = [value doubleValue];
                 }
-                return NULL;
+                else {
-            }
+                    NSException *e = [NSException exceptionWithName:MORuntimeException reason:[NSString stringWithFormat:@"No value for enum: %@", symbol] userInfo:nil];
-#else
+                    if (exception != NULL) {
-            if (value != nil) {
+                        *exception = [runtime JSValueForObject:e];
-                doubleValue = [value doubleValue];
+                    }
-            }
+                    return NULL;
-            else {
-                NSException *e = [NSException exceptionWithName:MORuntimeException reason:[NSString stringWithFormat:@"No value for enum: %@", symbol] userInfo:nil];
-                if (exception != NULL) {
-                    *exception = [runtime JSValueForObject:e];
                 }
-                return NULL;
+#if __LP64__
             }
 #endif
-
             return JSValueMakeNumber(ctx, doubleValue);
         }
     }
 
-    // Describe ourselves
-    if ([propertyName isEqualToString:@"toString"] || [propertyName isEqualToString:@"valueOf"]) {
-        JSStringRef scriptJS = JSStringCreateWithUTF8CString("return '(Mocha global object)'");
-        JSObjectRef fn = JSObjectMakeFunction(ctx, NULL, 0, NULL, scriptJS, NULL, 1, NULL);
-        JSStringRelease(scriptJS);
-        return fn;
-    }
-
     return NULL;
 }
 

diff --git a/Mocha/Objects/MOJavaScriptObject.m b/Mocha/Objects/MOJavaScriptObject.m
@@ -35,7 +35,7 @@ - (void)setJSObject:(JSObjectRef)JSObject JSContext:(JSContextRef)JSContext {
         JSValueUnprotect(_JSContext, _JSObject);
     }
     _JSObject = JSObject;
-    _JSContext = _JSContext;
+    _JSContext = JSContext;
     if (_JSObject != NULL) {
         JSValueProtect(_JSContext, _JSObject);
     }

diff --git a/Mocha/Utilities/MOFunctionArgument.h b/Mocha/Utilities/MOFunctionArgument.h
@@ -41,11 +41,8 @@
 // Storage
 @property (readonly) ffi_type *ffiType;
 @property (readonly) void** storage;
-@property (readonly) void** rawStoragePointer;
 @property (copy, readonly) NSString *typeDescription;
 
-- (void *)allocateStorage;
-
 // Values
 - (JSValueRef)getValueAsJSValueInContext:(JSContextRef)ctx;
 - (void)setValueAsJSValue:(JSValueRef)value context:(JSContextRef)ctx;

diff --git a/Mocha/Utilities/MOFunctionArgument.m b/Mocha/Utilities/MOFunctionArgument.m
@@ -23,6 +23,13 @@
 #import <objc/runtime.h>
 
 
+@interface MOFunctionArgument ()
+
+- (void *)allocateStorage;
+
+@end
+
+
 @implementation MOFunctionArgument {
     char _typeEncoding;
     void* _storage;
@@ -180,10 +187,6 @@ - (void**)storage {
     return _storage;
 }
 
-- (void**)rawStoragePointer {
-    return _storage;
-}
-
 - (void *)allocateStorage {
     if (!_typeEncoding) {
         @throw [NSException exceptionWithName:MORuntimeException reason:[NSString stringWithFormat:@"No type encoding set in %@", self] userInfo:nil];