Merge lp:~abreu-alexandre/v8-cpp/fix-constructor-var-args into lp:v8-cpp

[Alexandre Abreu]

Fix constructor call with v8 var args (instead of plain args).

Fix constructor call with v8 var args (instead of plain args).

[Marcus Tomlinson (marcustomlinson)]

These changes have broken 2 other tests:

marcustomlinson@ubuntu:~/Projects/work/v8-cpp/trunk-build$ make test
Running tests...
Test project /home/marcustomlinson/Projects/work/v8-cpp/trunk-build
    Start 1: test-errors
1/6 Test #1: test-errors ...................... Passed 0.23 sec
    Start 2: test-functions
2/6 Test #2: test-functions ................... Passed 0.07 sec
    Start 3: test-members
3/6 Test #3: test-members ..................... Passed 0.02 sec
    Start 4: test-methods
4/6 Test #4: test-methods .....................***Failed 0.07 sec
    Start 5: test-objects
5/6 Test #5: test-objects ..................... Passed 0.10 sec
    Start 6: test-run
6/6 Test #6: test-run .........................***Failed 0.03 sec

67% tests passed, 2 tests failed out of 6

Total Test time (real) = 0.52 sec

The following tests FAILED:
   4 - test-methods (Failed)
   6 - test-run (Failed)
Errors while running CTest
Makefile:75: recipe for target 'test' failed
make: *** [test] Error 8

review: Needs Fixing

[lp:~abreu-alexandre/v8-cpp/fix-constructor-var-args]

37. By Alexandre Abreu on 2015-11-05

remove const & refs to properly compare IsDirectArgs

38. By Alexandre Abreu on 2015-11-05

Add removed test

[Alexandre Abreu (abreu-alexandre)]

updated

[Marcus Tomlinson (marcustomlinson)]

Nice, works well. Thanks!

review: Approve

=== modified file 'src/internal/call.h'
--- src/internal/call.h	2015-06-10 05:57:04 +0000
+++ src/internal/call.h	2015-11-05 19:43:55 +0000
@@ -95,12 +95,16 @@
 
 template <typename F>
 using IsolateV8ArgsCallTraits = V8ArgsCallTraits<F, 1>;
-
+ 
 template <typename F, size_t Offset>
-using IsDirectArgs = std::integral_constant<bool,
-                                            CallFromV8Traits<F>::arg_count == (Offset + 1) &&
-                                                std::is_same<typename CallFromV8Traits<F>::template ArgType<Offset>,
-                                                             v8::FunctionCallbackInfo<v8::Value> const&>::value>;
+using IsDirectArgs =
+  std::integral_constant<bool,
+    CallFromV8Traits<F>::arg_count == (Offset + 1)
+    && std::is_same<
+         typename std::remove_const<
+                 typename std::remove_reference<typename CallFromV8Traits<F>::template ArgType<Offset>>::type
+             >::type,
+         v8::FunctionCallbackInfo<v8::Value>>::value>;
 
 template <typename F>
 using IsFirstArgIsolate =
@@ -123,6 +127,15 @@
     return func(CallTraits::template args_from_v8<Indices>(args)...);
 }
 
+template <typename F, size_t... Indices>
+typename FunctionTraits<F>::ReturnType call_from_v8_impl(F&& func,
+                                                         v8::FunctionCallbackInfo<v8::Value> const& args,
+                                                         IsolateV8ArgsCallTraits<F>,
+                                                         IndexSequence<Indices...>)
+{
+    return func(args.GetIsolate(), IsolateV8ArgsCallTraits<F>::template args_from_v8<Indices>(args)...);
+}
+
 template <typename T, typename F, typename CallTraits, size_t... Indices>
 typename FunctionTraits<F>::ReturnType call_from_v8_impl(
     T& obj, F&& func, v8::FunctionCallbackInfo<v8::Value> const& args, CallTraits, IndexSequence<Indices...>)

=== modified file 'tests/objects/module.cpp'
--- tests/objects/module.cpp	2015-10-09 10:43:41 +0000
+++ tests/objects/module.cpp	2015-11-05 19:43:55 +0000
@@ -27,6 +27,12 @@
     // Get current isolate
     Isolate* isolate = Isolate::GetCurrent();
 
+    // Prepare TestClassVariableConstructorArgs binding
+    v8cpp::Class<TestClassVariableConstructorArgs> testvarargsclass(isolate);
+    testvarargsclass
+      .set_constructor<v8::FunctionCallbackInfo<v8::Value>>()
+      .add_method("zero", &TestClassVariableConstructorArgs::zero);
+
     // Prepare TestClass binding
     v8cpp::Class<TestClass> testclass(isolate);
     testclass
@@ -52,6 +58,7 @@
 
     module.add_class("TestClass", testclass);
     module.add_class("EmbeddedTestClass", embeddedtestclass);
+    module.add_class("TestClassVariableConstructorArgs", testvarargsclass);
 
     module.add_function("new_TestClass", &new_TestClass);
 

=== modified file 'tests/objects/test.cpp'
--- tests/objects/test.cpp	2015-10-09 10:43:41 +0000
+++ tests/objects/test.cpp	2015-11-05 19:43:55 +0000
@@ -151,3 +151,15 @@
 
     EXPECT_EQ(result, 2);
 }
+
+TEST(Test, construct_var_args_class_via_new)
+{
+    auto test_object = v8cpp::run_script<TestClassVariableConstructorArgs>(
+    R"(
+        var module = require("./test-objects-module");
+        var test_object = new module.TestClassVariableConstructorArgs(1, 2, "me");
+        test_object;
+    )");
+
+    EXPECT_EQ(test_object.zero(), 1);
+}

=== modified file 'tests/objects/test.h'
--- tests/objects/test.h	2015-10-09 10:43:41 +0000
+++ tests/objects/test.h	2015-11-05 19:43:55 +0000
@@ -22,6 +22,8 @@
 
 #include <memory>
 
+#include <v8-cpp.h>
+
 class EmbeddedTestClass
 {
 public:
@@ -41,6 +43,23 @@
     int i_;
 };
 
+class TestClassVariableConstructorArgs
+{
+public:
+    TestClassVariableConstructorArgs(v8::FunctionCallbackInfo<v8::Value> const& args) {
+    if (args.Length() > 0 && args[0]->IsNumber()) {
+        v_ = args[0]->ToNumber()->Value();
+      }
+    }
+
+    int zero() const {
+      return v_;
+    }
+
+ private:
+    int v_;
+};
+
 class TestClass
 {
 public: