Accept initializers when allocating Type with new.

diff --git a/Execute.cpp b/Execute.cpp
index deafccbcc31cd11a56c0b00f05a714a4f5a11a77..cc47fd695b299e36f38ece2daffad05257dd7fbc 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -1536,10 +1536,11 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object,
         return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);
 
     CYPool pool;
         return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);
 
     CYPool pool;

+

     sig::Type *type(internal->type_);
     ffi_type *ffi(internal->GetFFI());
     sig::Type *type(internal->type_);
     ffi_type *ffi(internal->GetFFI());

-

     void *data(pool.malloc<void>(ffi->size, ffi->alignment));
     void *data(pool.malloc<void>(ffi->size, ffi->alignment));

+

     type->PoolFFI(&pool, context, ffi, data, arguments[0]);
     JSValueRef value(type->FromFFI(context, ffi, data));
 
     type->PoolFFI(&pool, context, ffi, data, arguments[0]);
     JSValueRef value(type->FromFFI(context, ffi, data));
 


@@ -1553,15 +1554,22 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object,
 } CYCatch(NULL) }
 
 static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
 } CYCatch(NULL) }
 
 static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {

-    if (count != 0)
+    if (count > 1)

         throw CYJSError(context, "incorrect number of arguments to Type allocator");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
     JSObjectRef pointer(CYMakePointer(context, NULL, *internal->type_, NULL, NULL));
     Pointer *value(reinterpret_cast<Pointer *>(JSObjectGetPrivate(pointer)));
         throw CYJSError(context, "incorrect number of arguments to Type allocator");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
     JSObjectRef pointer(CYMakePointer(context, NULL, *internal->type_, NULL, NULL));
     Pointer *value(reinterpret_cast<Pointer *>(JSObjectGetPrivate(pointer)));

+
+    sig::Type *type(internal->type_);

     ffi_type *ffi(internal->GetFFI());
     value->value_ = value->pool_->malloc<void>(ffi->size, ffi->alignment);
     ffi_type *ffi(internal->GetFFI());
     value->value_ = value->pool_->malloc<void>(ffi->size, ffi->alignment);

-    memset(value->value_, 0, ffi->size);
+
+    if (count == 0)
+        memset(value->value_, 0, ffi->size);
+    else
+        type->PoolFFI(value->pool_, context, ffi, value->value_, arguments[0]);
+

     return pointer;
 } CYCatch(NULL) }
 
     return pointer;
 } CYCatch(NULL) }