Add debug log method.

kishikawakatsumi · kishikawakatsumi · commit c4adb94cba04 · 2014-02-06T03:38:58.000+09:00
diff --git a/Classes/JSBScriptingSupport.h b/Classes/JSBScriptingSupport.h
@@ -30,6 +30,8 @@ JSExportAs(dispatch_get_global_queue,
 + (id)dispatch_get_main_queue;
 
 @optional
+JSExportAs(log,
++ (void)log:(NSString *)format arguments:(NSArray *)arguments);
 JSExportAs(dump,
 + (void)dump:(id)object);
 
diff --git a/Classes/JSBScriptingSupport.m b/Classes/JSBScriptingSupport.m
@@ -59,6 +59,13 @@ + (void)initialize
          @"    dispatch_get_main_queue: function() {\n"
          @"      return __JSB_JSBScriptingSupport.dispatch_get_main_queue();\n"
          @"    },\n"
+         @"    log: function(format) {\n"
+         @"      var args = [];\n"
+         @"      for (var i = 1; i < arguments.length; i++) {\n"
+         @"        args.push(arguments[i]);\n"
+         @"      }\n"
+         @"      return __JSB_JSBScriptingSupport.log(format, args);\n"
+         @"    },\n"
          @"    dump: function(obj) {\n"
          @"      return __JSB_JSBScriptingSupport.dump(obj);\n"
          @"    }\n"
@@ -192,12 +199,11 @@ + (id)dispatch_get_main_queue
 
 #pragma mark - for debug
 
-+ (void)log:(NSString *)format, ...
++ (void)log:(NSString *)format arguments:(NSArray *)arguments
 {
-    va_list args;
-    va_start(args, format);
-    NSString *result = [[NSString alloc] initWithFormat:format arguments:args];
-    va_end(args);
+    __unsafe_unretained id *argList = createVariableArgumentListsFromArray(arguments);
+    NSString *result = [[NSString alloc] initWithFormat:format, *argList];
+    free(argList);
     
     NSLog(@"%@", result);
 }
diff --git a/Classes/Private/JSBMessageForwarding.h b/Classes/Private/JSBMessageForwarding.h
@@ -32,3 +32,5 @@ void setupForwardingImplementations(Class targetClass, Class cls, JSValue *insta
 void forwardInvocation(id self, SEL _cmd, NSInvocation *invocation);
 NSMethodSignature *methodSignatureForSelector(id self, SEL _cmd, SEL selector);
 BOOL respondsToSelector(id self, SEL _cmd, SEL selector);
+
+__unsafe_unretained id *createVariableArgumentListsFromArray(NSArray *arguments);
diff --git a/Classes/Private/JSBMessageForwarding.m b/Classes/Private/JSBMessageForwarding.m
@@ -386,3 +386,15 @@ BOOL respondsToSelector(id self, SEL _cmd, SEL selector)
     
     return !function.isUndefined;
 }
+
+#pragma mark -
+
+__unsafe_unretained id *createVariableArgumentListsFromArray(NSArray *arguments)
+{
+    __unsafe_unretained id *argList = (__unsafe_unretained id *) calloc(1UL, sizeof(id) * arguments.count);
+    for (NSInteger i = 0; i < arguments.count; i++) {
+        argList[i] = arguments[i];
+    }
+    
+    return argList;
+}
