Change AsCtor bool to enum

Author: RReverser

src/embind/emval.js

@@ -331,7 +331,7 @@ var LibraryEmVal = {
     '$newFunc',
 #endif
   ],
-  _emval_get_method_caller: (argCount, argTypes, asCtor) => {
+  _emval_get_method_caller: (argCount, argTypes, kind) => {
     var types = emval_lookupTypes(argCount, argTypes);
     var retType = types.shift();
     argCount--; // remove the shifted off return type
@@ -344,7 +344,7 @@ var LibraryEmVal = {
         argN[i] = types[i]['readValueFromPointer'](args + offset);
         offset += types[i]['argPackAdvance'];
       }
-      var rv = asCtor ? reflectConstruct(func, argN) : func.apply(obj, argN);
+      var rv = kind === /* CONSTRUCTOR */ 1 ? reflectConstruct(func, argN) : func.apply(obj, argN);
       for (var i = 0; i < argCount; ++i) {
         if (types[i].deleteObject) {
           types[i].deleteObject(argN[i]);
@@ -360,7 +360,9 @@ var LibraryEmVal = {
 
     var offset = 0;
     var argsList = []; // 'obj?, arg0, arg1, arg2, ... , argN'
-    if (!asCtor) argsList.push("obj");
+    if (kind === /* FUNCTION */ 0) {
+      argsList.push("obj");
+    }
     var params = ["retType"];
     var args = [retType];
     for (var i = 0; i < argCount; ++i) {
@@ -371,8 +373,9 @@ var LibraryEmVal = {
         `  var arg${i} = argType${i}.readValueFromPointer(args${offset ? "+" + offset : ""});\n`;
       offset += types[i]['argPackAdvance'];
     }
+    var invoker = kind === /* CONSTRUCTOR */ 1 ? 'new func' : 'func.call';
     functionBody +=
-      `  var rv = ${asCtor ? 'new func' : 'func.call'}(${argsList.join(", ")});\n`;
+      `  var rv = ${invoker}(${argsList.join(", ")});\n`;
     for (var i = 0; i < argCount; ++i) {
       if (types[i]['deleteObject']) {
         functionBody +=

system/include/emscripten/val.h

@@ -31,6 +31,11 @@ namespace internal {
 template<typename WrapperType>
 val wrapped_extend(const std::string&, const val&);
 
+enum class EM_METHOD_CALLER_KIND {
+  FUNCTION = 0,
+  CONSTRUCTOR = 1,
+};
+
 // Implemented in JavaScript.  Don't call these directly.
 extern "C" {
 
@@ -87,7 +92,7 @@ EM_GENERIC_WIRE_TYPE _emval_call(
 EM_METHOD_CALLER _emval_get_method_caller(
     unsigned argCount, // including return value
     const TYPEID argTypes[],
-    bool asCtor);
+    EM_METHOD_CALLER_KIND asCtor);
 EM_GENERIC_WIRE_TYPE _emval_call_method(
     EM_METHOD_CALLER caller,
     EM_VAL handle,
@@ -112,7 +117,7 @@ struct symbol_registrar {
   }
 };
 
-template<bool AsCtor, typename ReturnType, typename... Args>
+template<EM_METHOD_CALLER_KIND Kind, typename ReturnType, typename... Args>
 struct Signature {
   /*
   typedef typename BindingType<ReturnType>::WireType (*MethodCaller)(
@@ -123,7 +128,7 @@ struct Signature {
   */
   static EM_METHOD_CALLER get_method_caller() {
     static constexpr WithPolicies<>::ArgTypeList<ReturnType, Args...> args;
-    thread_local EM_METHOD_CALLER mc = _emval_get_method_caller(args.getCount(), args.getTypes(), AsCtor);
+    thread_local EM_METHOD_CALLER mc = _emval_get_method_caller(args.getCount(), args.getTypes(), Kind);
     return mc;
   }
 };
@@ -482,19 +487,23 @@ class val {
 
   template<typename... Args>
   val new_(Args&&... args) const {
-    return internalCall<true, val>(internal::_emval_call, std::forward<Args>(args)...);
+    using namespace internal;
+
+    return internalCall<EM_METHOD_CALLER_KIND::CONSTRUCTOR, val>(_emval_call, std::forward<Args>(args)...);
   }
 
   template<typename... Args>
   val operator()(Args&&... args) const {
-    return internalCall<false, val>(internal::_emval_call, std::forward<Args>(args)...);
+    using namespace internal;
+
+    return internalCall<EM_METHOD_CALLER_KIND::FUNCTION, val>(_emval_call, std::forward<Args>(args)...);
   }
 
   template<typename ReturnValue, typename... Args>
   ReturnValue call(const char* name, Args&&... args) const {
     using namespace internal;
 
-    return internalCall<false, ReturnValue>(
+    return internalCall<EM_METHOD_CALLER_KIND::FUNCTION, ReturnValue>(
       [name](EM_METHOD_CALLER caller,
              EM_VAL handle,
              EM_DESTRUCTORS* destructorsRef,
@@ -578,14 +587,14 @@ class val {
   template<typename WrapperType>
   friend val internal::wrapped_extend(const std::string& , const val& );
 
-  template<bool AsCtor, typename Ret, typename Implementation, typename... Args>
+  template<internal::EM_METHOD_CALLER_KIND Kind, typename Ret, typename Implementation, typename... Args>
   Ret internalCall(Implementation impl, Args&&... args) const {
     using namespace internal;
 
     WireTypePack<Args...> argv(std::forward<Args>(args)...);
     EM_DESTRUCTORS destructors = nullptr;
     EM_GENERIC_WIRE_TYPE result = impl(
-      Signature<AsCtor, Ret, Args...>::get_method_caller(),
+      Signature<Kind, Ret, Args...>::get_method_caller(),
       as_handle(),
       &destructors,
       argv);