issue/14745 code

tests/webidl/output_DEFAULT.txt

@@ -108,5 +108,6 @@ struct_ptr_array[0]->attr2 == 101
 Parent:0
 Parent:42
 |abc|1|(null)|123|
+123
 
 done.

tests/webidl/post.js

@@ -285,7 +285,35 @@ if (isMemoryGrowthAllowed) {
   }
 }
 
-//
+// Part issue 14745
+
+function createSmallObject() {
+  let smObject = new TheModule.JSSmallObject();
+  smObject.getID = ( number ) => number;
+  return smObject;
+}
+
+function createProviderObject() {
+
+  var provider = new TheModule.JSObjectProvider();
+  provider.getObject = function() {
+    let tempSmallObject = createSmallObject();
+    return tempSmallObject.ptr;
+  }
+  return provider;
+}
+
+var factory = new TheModule.ObjectFactory();
+var objectProvider = factory.getProvider( createProviderObject() );
+var smallObject = objectProvider.getObject();
+
+// this will print 123 if you can instantiate an object, which means that integers
+// are correctly typecast to ObjectProvider pointer and SmallObject pointer
+console.log(smallObject.getID(123));
+
+// end of issue 14745
+
+
 
 console.log('\ndone.')
 })();

tests/webidl/test.h

@@ -193,3 +193,59 @@ typedef struct LongLongTypes {
   unsigned long long* lluArray;
   long long ll;
 } LongLongTypes;
+
+///
+
+struct ISmallObject {
+  virtual int getID(int number) = 0;
+};
+
+struct IObjectProvider {
+  virtual ISmallObject* getObject() = 0;
+};
+
+class SmallObject : public ISmallObject {
+public:
+  SmallObject( ISmallObject* smallObject)
+  : m_object(smallObject) {
+
+  }
+  int getID(int number) {
+    return number;
+  }
+private:
+  ISmallObject* m_object;
+};
+
+class ObjectProvider : public IObjectProvider {
+public:
+  ObjectProvider( IObjectProvider* provider)
+  : m_provider(provider) {
+
+  }
+
+  ISmallObject* getObject() {
+    auto * object = m_provider->getObject();
+    return new SmallObject(object);
+  }
+private: 
+  IObjectProvider* m_provider;
+};
+
+class ObjectFactory {
+public:
+  ObjectFactory() {
+
+  }
+
+  IObjectProvider* getProvider( IObjectProvider* objectProvider ) {
+    return new ObjectProvider(objectProvider);
+  }
+
+private:
+
+<<<<<<< HEAD
+};
+=======
+};
+>>>>>>> 4f765dec0830dce21da8ed2db74ecabbd7a48186

tests/webidl/test.idl

@@ -169,3 +169,30 @@ interface LongLongTypes {
   readonly attribute unsigned long long[] lluArray;
   attribute long long ll;
 };
+
+[NoDelete]
+interface ISmallObject {
+  long getID( long number );
+};
+
+[JSImplementation="ISmallObject"]
+interface JSSmallObject {
+  void JSSmallObject();
+  long getID(long number);
+};
+
+[NoDelete]
+interface IObjectProvider {
+  ISmallObject getObject();
+};
+
+[JSImplementation="IObjectProvider"]
+interface JSObjectProvider {
+  void JSObjectProvider();
+  JSSmallObject getObject();
+};
+
+interface ObjectFactory {
+  void ObjectFactory();
+  IObjectProvider getProvider( IObjectProvider provider );
+};

tools/webidl_binder.py

@@ -366,11 +366,25 @@ def deref_if_nonpointer(m):
   return ''
 
 
+# def type_to_cdec(raw):
+#   ret = type_to_c(raw.type.name, non_pointing=True)
+#   if raw.getExtendedAttribute('Const'):
+#     ret = 'const ' + ret
+#   if raw.type.name not in interfaces:
+#     return ret
+#   if raw.getExtendedAttribute('Ref'):
+#     return ret + '&'
+#   if raw.getExtendedAttribute('Value'):
+#     return ret
+#   return ret + '*'
+
 def type_to_cdec(raw):
   ret = type_to_c(raw.type.name, non_pointing=True)
   if raw.getExtendedAttribute('Const'):
     ret = 'const ' + ret
   if raw.type.name not in interfaces:
+    if raw.type.isArray():
+      return ret + '*'
     return ret
   if raw.getExtendedAttribute('Ref'):
     return ret + '&'
@@ -589,13 +603,13 @@ def render_function(class_name, func_name, sigs, return_type, non_pointer,
         js_call_args = ', '.join(['%s%s' % (('(int)' if sig[j] in interfaces else '') + take_addr_if_nonpointer(raw[j]), args[j]) for j in range(i)])
 
         js_impl_methods.append(r'''  %s %s(%s) %s {
-    %sEM_ASM_%s({
+    %s (%s) EM_ASM_%s({
       var self = Module['getCache'](Module['%s'])[$0];
       if (!self.hasOwnProperty('%s')) throw 'a JSImplementation must implement all functions, you forgot %s::%s.';
       %sself['%s'](%s)%s;
     }, (int)this%s);
   }''' % (c_return_type, func_name, dec_args, maybe_const,
-          basic_return, 'INT' if c_return_type not in C_FLOATS else 'DOUBLE',
+          basic_return, c_return_type, 'INT' if c_return_type not in C_FLOATS else 'DOUBLE',
           class_name,
           func_name, class_name, func_name,
           return_prefix,