Allow value_tuple and value_struct to be registered as global constants. This involved reworking how value_struct and value_tuple are registered.

2 files changed, 9 insertions, 1 deletions

diff --git a/tests/embind/embind.test.js b/tests/embind/embind.test.js
index 7bb3985f..11746214 100755
--- a/tests/embind/embind.test.js
+++ b/tests/embind/embind.test.js
@@ -1519,7 +1519,8 @@ module({
     BaseFixture.extend("constants", function() {
         assert.equal(10, cm.INT_CONSTANT);
         assert.equal("some string", cm.STRING_CONSTANT);
-        //assert.deepEqual([1, 2, 3], cm.VALUE_TUPLE_CONSTANT);
+        assert.deepEqual([1, 2, 3], cm.VALUE_TUPLE_CONSTANT);
+        assert.deepEqual({x:1,y:2,z:3}, cm.VALUE_STRUCT_CONSTANT);
     });
 });
 
diff --git a/tests/embind/embind_test.cpp b/tests/embind/embind_test.cpp
index 4d1b376b..be089f9f 100644
--- a/tests/embind/embind_test.cpp
+++ b/tests/embind/embind_test.cpp
@@ -1355,11 +1355,18 @@ int overloaded_function(int i, int j)
 EMSCRIPTEN_BINDINGS(constants) {

     constant("INT_CONSTANT", 10);

     constant("STRING_CONSTANT", std::string("some string"));

+

     TupleVector tv;

     tv.x = 1;

     tv.y = 2;

     tv.z = 3;

     constant("VALUE_TUPLE_CONSTANT", tv);

+

+    StructVector sv;

+    sv.x = 1;

+    sv.y = 2;

+    sv.z = 3;

+    constant("VALUE_STRUCT_CONSTANT", sv);

 }

 

 EMSCRIPTEN_BINDINGS(tests) {