koffi 2.4.1 → 2.5.0-beta.1

package/src/koffi/src/parser.cc

@@ -75,7 +75,7 @@ bool PrototypeParser::Parse(const char *str, FunctionInfo *out_func)
             param.type = ParseType();
 
             if (!CanPassType(param.type, param.directions)) {
-                MarkError("Type %1 cannot be used as a parameter (maybe try %1 *)", param.type->name);
+                MarkError("Type %1 cannot be used as a parameter", param.type->name);
                 return false;
             }
             if (out_func->parameters.len >= MaxParameters) {

package/src/koffi/src/util.cc

@@ -58,14 +58,19 @@ Napi::Function MagicUnion::InitClass(Napi::Env env, const TypeInfo *type)
 MagicUnion::MagicUnion(const Napi::CallbackInfo &info)
     : Napi::ObjectWrap<MagicUnion>(info), type((const TypeInfo *)info.Data())
 {
+    Napi::Env env = info.Env();
+    InstanceData *instance = env.GetInstanceData<InstanceData>();
+
+    active_symbol = instance->active_symbol;
 }
 
 void MagicUnion::SetRaw(const uint8_t *ptr)
 {
-    raw = ptr;
+    raw.RemoveFrom(0);
+    raw.Append(MakeSpan(ptr, type->size));
 
+    Value().Set(active_symbol, Env().Undefined());
     active_idx = -1;
-    Value().Set("__active", Env().Undefined());
 }
 
 Napi::Value MagicUnion::Getter(const Napi::CallbackInfo &info)
@@ -76,18 +81,18 @@ Napi::Value MagicUnion::Getter(const Napi::CallbackInfo &info)
     Napi::Value value;
 
     if (idx == active_idx) {
-        value = Value().Get("__active");
+        value = Value().Get(active_symbol);
     } else {
         Napi::Env env = info.Env();
 
-        if (RG_UNLIKELY(!raw)) {
+        if (RG_UNLIKELY(!raw.len)) {
             ThrowError<Napi::Error>(env, "Cannont convert %1 union value", active_idx < 0 ? "empty" : "assigned");
             return env.Null();
         }
 
-        value = Decode(env, raw, member.type);
+        value = Decode(env, raw.ptr, member.type);
 
-        Value().Set("__active", value);
+        Value().Set(active_symbol, value);
         active_idx = idx;
     }
 
@@ -99,10 +104,10 @@ void MagicUnion::Setter(const Napi::CallbackInfo &info, const Napi::Value &value
 {
     Size idx = (Size)info.Data();
 
-    Value().Set("__active", value);
+    Value().Set(active_symbol, value);
     active_idx = idx;
 
-    raw = nullptr;
+    raw.Clear();
 }
 
 const TypeInfo *ResolveType(Napi::Value value, int *out_directions)
@@ -272,10 +277,11 @@ const TypeInfo *MakePointerType(InstanceData *instance, const TypeInfo *ref, int
         char name_buf[256];
         Fmt(name_buf, "%1%2*", ref->name, EndsWith(ref->name, "*") ? "" : " ");
 
-        TypeInfo *type = (TypeInfo *)instance->types_map.FindValue(name_buf, nullptr);
+        bool inserted;
+        auto bucket = instance->types_map.TrySetDefault(name_buf, &inserted);
 
-        if (!type) {
-            type = instance->types.AppendDefault();
+        if (inserted) {
+            TypeInfo *type = instance->types.AppendDefault();
 
             type->name = DuplicateString(name_buf, &instance->str_alloc).ptr;
 
@@ -291,10 +297,11 @@ const TypeInfo *MakePointerType(InstanceData *instance, const TypeInfo *ref, int
                 type->ref.proto = ref->ref.proto;
             }
 
-            instance->types_map.Set(type->name, type);
+            bucket->key = type->name;
+            bucket->value = type;
         }
 
-        ref = type;
+        ref = bucket->value;
     }
 
     return ref;
@@ -371,6 +378,8 @@ bool CanPassType(const TypeInfo *type, int directions)
             return false;
         if (type->primitive == PrimitiveKind::Prototype)
             return false;
+        if (type->primitive == PrimitiveKind::Callback && type->ref.proto->variadic)
+            return false;
 
         return true;
     }
@@ -394,6 +403,8 @@ bool CanStoreType(const TypeInfo *type)
         return false;
     if (type->primitive == PrimitiveKind::Prototype)
         return false;
+    if (type->primitive == PrimitiveKind::Callback && type->ref.proto->variadic)
+        return false;
 
     return true;
 }

package/src/koffi/src/util.hh

@@ -38,8 +38,10 @@ extern const int MagicUnionMarker;
 class MagicUnion: public Napi::ObjectWrap<MagicUnion> {
     const TypeInfo *type;
 
+    napi_value active_symbol;
     Size active_idx = -1;
-    const uint8_t *raw = nullptr;
+
+    HeapArray<uint8_t> raw;
 
 public:
     static Napi::Function InitClass(Napi::Env env, const TypeInfo *type);
@@ -49,7 +51,7 @@ public:
     const RecordMember *GetMember() const { return (active_idx >= 0) ? &type->members[active_idx] : nullptr; }
 
     void SetRaw(const uint8_t *ptr);
-    const uint8_t *GetRaw() const { return raw; }
+    const uint8_t *GetRaw() const { return raw.ptr; }
 
 private:
     Napi::Value Getter(const Napi::CallbackInfo &info);