Separate go's type as boolean/number/string #9

Author: mattn

v8.go

@@ -26,6 +26,7 @@ import (
 	"fmt"
 	"regexp"
 	"runtime"
+	"strconv"
 	"text/template"
 	"unsafe"
 
@@ -63,17 +64,18 @@ func (f V8Function) Call(args ...interface{}) (interface{}, error) {
 			})
 			arguments.WriteString("(" + buf.String() + ")")
 		} else {
-			obj, ok := arg.(V8Object)
-			if ok {
-				// arg is a JavaScript object
+			if obj, ok := arg.(V8Object); ok {
 				arguments.WriteString(obj.Name)
-			} else {
-				// arg is a Go object; marshal to JSON
-				b, err := json.Marshal(arg)
-				if err != nil {
-					return nil, err
+			} else if num, ok := arg.(float64); ok {
+				arguments.WriteString(fmt.Sprintf("%v", num))
+			} else if bln, ok := arg.(bool); ok {
+				if bln  {
+					arguments.WriteString("true")
+				} else {
+					arguments.WriteString("false")
 				}
-				arguments.WriteString(string(b))
+			} else if str, ok := arg.(string); ok {
+				arguments.WriteString(str)
 			}
 		}
 		if i != len(args)-1 {
@@ -108,6 +110,23 @@ func _go_v8_callback(contextId uint32, functionName *C.char, v8Objects *C.v8data
 			case C.v8function:
 				argv = append(argv, V8Function{ctx, C.GoString(obj.repr)})
 				break
+			case C.v8number:
+				if f, err := strconv.ParseFloat(C.GoString(obj.repr), 64); err == nil {
+					argv = append(argv, f)
+				} else {
+					argv = append(argv, 0.0)
+				}
+				break
+			case C.v8string:
+				argv = append(argv, C.GoString(obj.repr))
+				break
+			case C.v8boolean:
+				if C.GoString(obj.repr) == "true" {
+					argv = append(argv, true)
+				} else {
+					argv = append(argv, false)
+				}
+				break
 			default:
 				// Should be a JSON string, so pass it as-is
 				argv = append(argv, C.GoString(obj.repr))

v8_test.go

@@ -1,7 +1,6 @@
 package v8
 
 import (
-	"encoding/json"
 	"fmt"
 	"sync"
 	"testing"
@@ -57,20 +56,15 @@ func TestAddFunc(t *testing.T) {
 			t.Fatal("Unexpected number of _gov8_testFunc's arguments.", len(args))
 		}
 		// First argument
-		var num float64
-		err := json.Unmarshal([]byte(args[0].(string)), &num)
-		if err != nil {
-			t.Fatal("Error unmarshalling arg 0", err)
-		}
-
+		num := args[0].(float64)
 		argVal := int(num)
 		if argVal != 10 {
 			t.Fatal("Unexpected value for arg 0, expected 10, received:", argVal)
 		}
 
 		// Second argument
 		argVal2 := args[1].(string)
-		if argVal2 != `"Test string"` {
+		if argVal2 != `Test string` {
 			t.Fatal("Unexpected value for arg 1, expected Test string, received:", argVal2)
 		}
 
@@ -95,21 +89,9 @@ func TestAddFunc(t *testing.T) {
 func TestAddFuncReturnObject(t *testing.T) {
 	ctx := NewContext()
 	err := ctx.AddFunc("testFunc", func(args ...interface{}) interface{} {
-		var arg0 float64
-		err := json.Unmarshal([]byte(args[0].(string)), &arg0)
-		if err != nil {
-			t.Fatal("Error unmarshalling arg 0", err)
-		}
-
-		var arg1 string
-		err = json.Unmarshal([]byte(args[1].(string)), &arg1)
-		if err != nil {
-			t.Fatal("Error unmarshalling arg 1", err)
-		}
-
 		return map[string]interface{}{
-			"arg0": arg0,
-			"arg1": arg1,
+			"arg0": args[0].(float64),
+			"arg1": args[1].(string),
 		}
 	})
 	if err != nil {

v8wrap.cc

@@ -65,20 +65,22 @@ _go_call(const v8::Arguments& args) {
   for (int i = 0; i < realArgs->Length(); i++) {
     v8::Local<v8::Value> arg = realArgs->Get(i);
 
+    v8::String::Utf8Value argString(arg);
     if (arg->IsRegExp()) {
       data[i].obj_type = v8regexp;
-
-      v8::String::Utf8Value argString(arg);
       data[i].repr = __strdup(*argString);
     } else if (arg->IsFunction()) {
       data[i].obj_type = v8function;
-
-      v8::String::Utf8Value argString(arg);
+      data[i].repr = __strdup(*argString);
+    } else if (arg->IsNumber()) {
+      data[i].obj_type = v8number;
+      data[i].repr = __strdup(*argString);
+    } else if (arg->IsBoolean()) {
+      data[i].obj_type = v8boolean;
       data[i].repr = __strdup(*argString);
     } else {
-      // Convert to JSON
       data[i].obj_type = v8string;
-      data[i].repr = __strdup(to_json(arg).c_str());
+      data[i].repr = __strdup(*argString);
     }
   }
 

v8wrap.h

@@ -12,7 +12,7 @@ extern char* v8_execute(void* ctx, char* str);
 extern char* v8_error(void* ctx);
 
 typedef enum {
-  v8regexp, v8string, v8function
+  v8boolean, v8number, v8string, v8function, v8regexp
 } v8type;
 
 typedef struct {