Merge pull request emscripten-core#734 from dinibu/incoming

kripken · kripken · commit 98d730f930f1 · 2012-11-30T10:51:20.000-08:00
Fixed embind for non-void non-const class methods (with test). Fixes issue emscripten-core#605.
diff --git a/AUTHORS b/AUTHORS
@@ -41,4 +41,5 @@ a license to everyone to use it as detailed in LICENSE.)
 * Joel Martin <github@martintribe.org>
 * Manuel Wellmann <manuel.wellmann@autodesk.com> (copyright owned by Autodesk, Inc.)
 * Xuejie Xiao <xxuejie@gmail.com>
+* Dominic Wong <dom@slowbunyip.org>
 
diff --git a/system/include/emscripten/bind.h b/system/include/emscripten/bind.h
@@ -218,7 +218,7 @@ namespace emscripten {
         template<typename ClassType, typename ReturnType, typename... Args>
         struct MethodInvoker {
             typedef ReturnType (ClassType::*MemberPointer)(Args...);
-            typename internal::BindingType<ReturnType>::WireType invoke(
+            static typename internal::BindingType<ReturnType>::WireType invoke(
                 ClassType* ptr,
                 const MemberPointer& method,
                 typename internal::BindingType<Args>::WireType... args
diff --git a/tests/embind/embind_test.cpp b/tests/embind/embind_test.cpp
@@ -96,6 +96,10 @@ class ValHolder {
         this->v = v;
     }
 
+    int returnIntPlusFive( int x ) {
+        return x + 5;
+    }
+
     static int some_class_method(int i) {
         return i;
     }
@@ -286,6 +290,7 @@ EMSCRIPTEN_BINDINGS(([]() {
         .constructor<val>()
         .method("getVal", &ValHolder::getVal)
         .method("setVal", &ValHolder::setVal)
+        .method("returnIntPlusFive", &ValHolder::returnIntPlusFive)
         .classmethod("some_class_method", &ValHolder::some_class_method)
         ;
     function("emval_test_return_ValHolder", &emval_test_return_ValHolder);
diff --git a/tests/embind/embind_test.js b/tests/embind/embind_test.js
@@ -137,6 +137,8 @@ module({
             c.setVal('1234');
             assert.equal('1234', c.getVal());
 
+            assert.equal(1239, c.returnIntPlusFive(1234));
+
             c.delete();
             assert.equal(0, cm.count_emval_handles());
         },

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,10 @@ class ValHolder {`
`96`	`96`	`this->v = v;`
`97`	`97`	`}`
`98`	`98`
	`99`	`+ int returnIntPlusFive( int x ) {`
	`100`	`+ return x + 5;`
	`101`	`+ }`
	`102`	`+`
`99`	`103`	`static int some_class_method(int i) {`
`100`	`104`	`return i;`
`101`	`105`	`}`
`@@ -286,6 +290,7 @@ EMSCRIPTEN_BINDINGS(([]() {`
`286`	`290`	`.constructor<val>()`
`287`	`291`	`.method("getVal", &ValHolder::getVal)`
`288`	`292`	`.method("setVal", &ValHolder::setVal)`
	`293`	`+ .method("returnIntPlusFive", &ValHolder::returnIntPlusFive)`
`289`	`294`	`.classmethod("some_class_method", &ValHolder::some_class_method)`
`290`	`295`	`;`
`291`	`296`	`function("emval_test_return_ValHolder", &emval_test_return_ValHolder);`