Merge branch 'feat/cnstr'

README.md

@@ -285,7 +285,7 @@ The class can be renamed on the JavaScript side by using the `NAMED_GENEPI_CLASS
 second argument. This is especially useful for binding a template class
 specialization with a more reasonable name: `NAMED_GENEPI_CLASS(Data<int>, IntData)`.
 
-Constructors are exported with a macro call `GENEPI_CONSTRUCTOR(types...);` where `types` is a comma-separated list of arguments to the constructor, such as `int, int`. Calling `GENEPI_CONSTRUCTOR` multiple times allows overloading it, but **each overload must have a different number of arguments**.
+Constructors are exported with a macro call `GENEPI_CONSTRUCTOR(types...);` where `types` is a comma-separated list of arguments to the constructor, such as `int, int`. Calling `GENEPI_CONSTRUCTOR` multiple times allows overloading it.
 
 Constructor arguments are the only types that `genepi` cannot detect automatically.
 

examples/classes/classes.cpp

@@ -37,6 +37,11 @@ class ClassExample
         std::cout << "Ints: " << a << " " << b << std::endl;
     }
 
+    ClassExample( int a )
+    {
+        std::cout << "Int: " << a << std::endl;
+    }
+
     ClassExample( const std::string& msg )
     {
         std::cout << "String: " << msg << std::endl;
@@ -50,6 +55,7 @@ GENEPI_CLASS( ClassExample )
     GENEPI_CONSTRUCTOR();
     GENEPI_CONSTRUCTOR( int, int );
     GENEPI_CONSTRUCTOR( const std::string& );
+    GENEPI_CONSTRUCTOR( int );
 }
 
 GENEPI_MODULE( classes );

examples/classes/classes.js

@@ -25,4 +25,5 @@ var classes = require('bindings')('genepi-classes');
 
 var a = new classes.ClassExample();
 var b = new classes.ClassExample(42, 54);
-var c = new classes.ClassExample("Don't panic");
+var c = new classes.ClassExample(42);
+var d = new classes.ClassExample("Don't panic");

include/genepi/bind_class.h

@@ -71,8 +71,20 @@ namespace genepi
         {
             try
             {
-                constructors_.at(
-                    static_cast< unsigned int >( info.Length() ) )( info );
+                for( const auto& constructor : constructors_.at(
+                         static_cast< unsigned int >( info.Length() ) ) )
+                {
+                    try
+                    {
+                        constructor( info );
+                        return;
+                    }
+                    catch( const Napi::Error& /*unsued*/ )
+                    {
+                        continue;
+                    }
+                }
+                throw Napi::Error::New( info.Env(), "Wrong argument types" );
             }
             catch( const std::out_of_range& )
             {

include/genepi/bind_class_base.h

@@ -57,7 +57,8 @@ namespace genepi
     public:
         void add_constructor( BaseSignature* signature )
         {
-            constructors_[signature->arity()] = signature->caller();
+            constructors_[signature->arity()].emplace_back(
+                signature->caller() );
         }
 
         void add_static_method(
@@ -123,7 +124,7 @@ namespace genepi
     protected:
         bool is_initialized_{ false };
         std::string name_;
-        std::map< unsigned int, Callable > constructors_;
+        std::map< unsigned int, std::vector< Callable > > constructors_;
         std::deque< MethodDefinition > static_methods_;
         std::deque< MethodDefinition > methods_;
         std::deque< SuperClassSpec > super_classes_;

include/genepi/signature/constructor_signature.h

@@ -42,9 +42,16 @@ namespace genepi
         using ConstructWrapper = Creator< Bound,
             typename MapWithIndex< TypeList, ArgFromNapiValue, Args... >::
                 type >;
+        using Parent =
+            TemplatedBaseSignature< ConstructorSignature, Bound *, Args... >;
 
         static Napi::Value call( const Napi::CallbackInfo &args )
         {
+            if( !Parent::CheckWrapper::are_types_valid( args ) )
+            {
+                throw Napi::Error::New(
+                    args.Env(), Parent::CheckWrapper::getTypeError( args ) );
+            }
             ConstructWrapper::create( args );
             return args.Env().Undefined();
         }