koffi 1.3.10 → 1.3.11

package/ChangeLog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Koffi 1.3.11
+
+**Main fixes:**
+
+- Fix broken parsing of `void *` when used for first parameter
+
 ## Koffi 1.3.10
 
 **Main fixes:**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "koffi",
-  "version": "1.3.10",
+  "version": "1.3.11",
   "description": "Fast and simple C FFI (foreign function interface) for Node.js",
   "keywords": [
     "foreign",

package/src/parser.cc

@@ -44,7 +44,8 @@ bool PrototypeParser::Parse(const char *str, FunctionInfo *out_func)
     out_func->name = ParseIdentifier();
 
     Consume("(");
-    if (offset < tokens.len && tokens[offset] != ")" && !Match("void")) {
+    offset += (offset + 1 < tokens.len && tokens[offset] == "void" && tokens[offset + 1] == ")");
+    if (offset < tokens.len && tokens[offset] != ")") {
         for (;;) {
             ParameterInfo param = {};
 

package/test/misc.c

@@ -158,7 +158,7 @@ EXPORT int32_t GetMinusOne4(void)
     return -1;
 }
 
-EXPORT int64_t GetMinusOne8(void)
+EXPORT int64_t GetMinusOne8(void *dummy)
 {
     return -1;
 }

package/test/sync.js

@@ -130,7 +130,7 @@ async function test() {
     const GetMinusOne1 = lib.func('int8_t GetMinusOne1(void)');
     const GetMinusOne2 = lib.func('int16_t GetMinusOne2(void)');
     const GetMinusOne4 = lib.func('int32_t GetMinusOne4(void)');
-    const GetMinusOne8 = lib.func('int64_t GetMinusOne8(void)');
+    const GetMinusOne8 = lib.func('int64_t GetMinusOne8(void *dummy)');
     const FillPack1 = lib.func('FillPack1', 'void', ['int', koffi.out(koffi.pointer(Pack1))]);
     const RetPack1 = lib.func('RetPack1', Pack1, ['int']);
     const AddPack1 = lib.fastcall('AddPack1', 'void', ['int', koffi.inout(koffi.pointer(Pack1))]);
@@ -187,7 +187,7 @@ async function test() {
     assert.equal(GetMinusOne1(), -1);
     assert.equal(GetMinusOne2(), -1);
     assert.equal(GetMinusOne4(), -1);
-    assert.equal(GetMinusOne8(), -1);
+    assert.equal(GetMinusOne8(null), -1);
 
     // Simple tests with Pack1
     {