Pass regexp as arguments. Really closes #10

Author: mattn

v8.go

@@ -66,6 +66,8 @@ func (f V8Function) Call(args ...interface{}) (interface{}, error) {
 		} else {
 			if v8obj, ok := arg.(V8NamedObject); ok {
 				arguments.WriteString(v8obj.Name)
+			} else if re, ok := arg.(*regexp.Regexp); ok {
+				arguments.WriteString(re.String())
 			} else {
 				json.NewEncoder(&arguments).Encode(arg)
 			}
@@ -185,10 +187,14 @@ func (v *V8Context) Eval(in string) (res interface{}, err error) {
 		out := C.GoString(ret)
 		if out != "" {
 			C.free(unsafe.Pointer(ret))
-			var buf bytes.Buffer
-			buf.Write([]byte(out))
-			dec := json.NewDecoder(&buf)
-			err = dec.Decode(&res)
+			if len(out) >= 2 && out[0] == '/' && out[len(out)-1] == '/' {
+				res, err = regexp.Compile(jsregexp.Translate(out))
+			} else {
+				var buf bytes.Buffer
+				buf.Write([]byte(out))
+				dec := json.NewDecoder(&buf)
+				err = dec.Decode(&res)
+			}
 			return
 		}
 		return nil, nil

v8_test.go

@@ -2,6 +2,7 @@ package v8
 
 import (
 	"fmt"
+	"regexp"
 	"sync"
 	"testing"
 )
@@ -146,6 +147,26 @@ func TestEvalScriptArray(t *testing.T) {
 	}
 }
 
+func TestEvalScriptRegExp(t *testing.T) {
+	ctx := NewContext()
+
+	res, err := ctx.Eval(`var a = /^[a-z][0-9]+$/; a`)
+	if err != nil {
+		t.Fatal("Unexpected error on eval,", err)
+	}
+	if res == nil {
+		t.Fatal("Expected result from eval, received nil")
+	}
+
+	v, ok := res.(*regexp.Regexp)
+	if !ok {
+		t.Fatal("Expected regexp, but not:", res)
+	}
+	if !v.MatchString("a123") {
+		t.Fatal(`Expected /^[a-z][0-9]+$/i match "a123", but not:`, v)
+	}
+}
+
 func TestAddFuncReturnObject(t *testing.T) {
 	ctx := NewContext()
 	err := ctx.AddFunc("testFunc", func(args ...interface{}) interface{} {

v8wrap.cc

@@ -10,7 +10,6 @@ extern "C" {
 char*
 __strdup(const char* ptr) {
   int l = strlen(ptr);
-  //char* p = (char*) malloc(l + 1);
   char* p = new char[l + 1];
   strcpy(p, ptr);
   return p;
@@ -219,6 +218,10 @@ v8_execute(void *ctx, char* source) {
     }
     else if (result->IsFunction() || result->IsUndefined()) {
       return __strdup("");
+    } else if (result->IsRegExp()) {
+      v8::Handle<v8::RegExp> re = v8::Handle<v8::RegExp>::Cast(result);
+      v8::String::Utf8Value ret(re->ToString());
+      return __strdup(*ret);
     } else {
       return __strdup(to_json(result).c_str());
     }