support parse declaration multiple variables are declared at once

Signed-off-by: Jianhui Zhao <[email protected]>
zhaojh329 · Jul 8, 2024 · 820df71 · 820df71
1 parent 5fa3f17
commit 820df71
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/ffi.c b/ffi.c
@@ -1545,7 +1545,7 @@ static int cparse_record_field(lua_State *L, struct crecord_field **fields)
 
     while (true) {
         struct crecord_field *field;
-        struct ctype ct = {};
+        struct ctype bt = {}, ct;
         bool flexible = false;
         int array_size;
         char *name;
@@ -1556,17 +1556,21 @@ static int cparse_record_field(lua_State *L, struct crecord_field **fields)
             return nfield;
 
         if (cparse_check_tok(L, tok) == TOK_STRUCT || cparse_check_tok(L, tok) == TOK_UNION) {
-            tok = cparse_record(L, &ct, cparse_check_tok(L, tok) == TOK_UNION);
+            tok = cparse_record(L, &bt, cparse_check_tok(L, tok) == TOK_UNION);
             if (tok == ';') {
                 field = calloc(1, sizeof(struct crecord_field) + 1);
                 if (!field)
                     return luaL_error(L, "no mem");
+                ct = bt;
                 goto add;
             }
         } else {
-            tok = cparse_basetype(L, tok, &ct);
+            tok = cparse_basetype(L, tok, &bt);
         }
 
+again:
+        ct = bt;
+
         tok = cparse_pointer(L, tok, &ct);
 
         check_void_forbidden(L, &ct, tok);
@@ -1587,15 +1591,21 @@ static int cparse_record_field(lua_State *L, struct crecord_field **fields)
         memcpy(field->name, name, yyget_leng());
 
         tok = cparse_array(L, yylex(), &flexible, &array_size);
-        if (cparse_check_tok(L, tok) != ';')
-            return cparse_expected_error(L, tok, ";");
 
         if (array_size >= 0)
             cparse_new_array(L, array_size, &ct);
 
 add:
         field->ct = ctype_lookup(L, &ct, false);
         fields[nfield++] = field;
+
+        if (cparse_check_tok(L, tok) == ',') {
+            tok = yylex();
+            goto again;
+        }
+
+        if (cparse_check_tok(L, tok) != ';')
+            return cparse_expected_error(L, tok, ";");
     }
 }
 

diff --git a/tests/basetype.lua b/tests/basetype.lua
@@ -53,6 +53,12 @@ ffi.cdef([[
         char name[0];
     };
 
+    typedef struct md5_ctx {
+        uint32_t lo, hi;
+        uint32_t a, b, c, d;
+        unsigned char buffer[64];
+    } md5_ctx_t;
+
     int printf(const char *format, ...);
     struct ComplexStruct *fun1();
     struct ComplexStruct *fun2(int a[]);