feat: add luaA_class_add_properties (#4051)

* feat: add luaA_class_add_properties

* feat: add array_growx and p_growx

* chore: luaA_class_add_properties use growx

* feat: add array_inserts

* chore: luaA_class_add_properties use inserts

Author: cnjhb

common/array.h

@@ -76,6 +76,9 @@
     static inline void pfx##_array_grow(pfx##_array_t *arr, int newlen) {   \
         p_grow(&arr->tab, newlen, &arr->size);                              \
     }                                                                       \
+    static inline void pfx##_array_growx(pfx##_array_t *arr, int newlen) {  \
+        p_growx(&arr->tab, newlen, &arr->size);                             \
+    }                                                                       \
     static inline void                                                      \
     pfx##_array_splice(pfx##_array_t *arr, int pos, int len,                \
                        type_t items[], int count)                           \
@@ -138,6 +141,14 @@
         }                                                                   \
         pfx##_array_splice(arr, r, 0, &e, 1);                               \
     }                                                                       \
+    static inline void                                                      \
+    pfx##_array_inserts(pfx##_array_t *arr, type_t items[], int count)      \
+    {                                                                       \
+        pfx##_array_growx(arr, arr->len + count);                           \
+        memcpy(arr->tab + arr->len, items, count * sizeof(*items));         \
+        arr->len += count;                                                  \
+        qsort(arr->tab, arr->len, sizeof(*items), cmp);                     \
+    }                                                                       \
     static inline type_t *                                                  \
     pfx##_array_lookup(pfx##_array_t *arr, type_t *e)                       \
     {                                                                       \

common/luaclass.c

@@ -24,18 +24,6 @@
 
 #define CONNECTED_SUFFIX "::connected"
 
-struct lua_class_property
-{
-    /** Name of the property */
-    const char *name;
-    /** Callback function called when the property is found in object creation. */
-    lua_class_propfunc_t new;
-    /** Callback function called when the property is found in object __index. */
-    lua_class_propfunc_t index;
-    /** Callback function called when the property is found in object __newindex. */
-    lua_class_propfunc_t newindex;
-};
-
 DO_ARRAY(lua_class_t *, lua_class, DO_NOTHING)
 
 static lua_class_array_t luaA_classes;
@@ -165,6 +153,14 @@ luaA_class_add_property(lua_class_t *lua_class,
                                     });
 }
 
+void
+luaA_class_add_properties(lua_class_t* lua_class,
+                          lua_class_property_t properties[],
+                          size_t count)
+{
+    lua_class_property_array_inserts(&lua_class->properties, properties, count);
+}
+
 /** Newindex meta function for objects after they were GC'd.
  * \param L The Lua VM state.
  * \return The number of elements pushed on stack.

common/luaclass.h

@@ -27,10 +27,6 @@
 #include <lua.h>
 #include <lauxlib.h>
 
-typedef struct lua_class_property lua_class_property_t;
-
-ARRAY_TYPE(lua_class_property_t, lua_class_property)
-
 #define LUA_OBJECT_HEADER \
         signal_array_t signals;
 
@@ -49,6 +45,21 @@ typedef int (*lua_class_propfunc_t)(lua_State *, lua_object_t *);
 
 typedef bool (*lua_class_checker_t)(lua_object_t *);
 
+typedef struct
+{
+    /** Name of the property */
+    const char *name;
+    /** Callback function called when the property is found in object creation. */
+    lua_class_propfunc_t new;
+    /** Callback function called when the property is found in object __index. */
+    lua_class_propfunc_t index;
+    /** Callback function called when the property is found in object __newindex. */
+    lua_class_propfunc_t newindex;
+}
+lua_class_property_t;
+
+ARRAY_TYPE(lua_class_property_t, lua_class_property)
+
 typedef struct lua_class_t lua_class_t;
 struct lua_class_t
 {
@@ -97,6 +108,7 @@ void luaA_class_setup(lua_State *, lua_class_t *, const char *, lua_class_t *,
 
 void luaA_class_add_property(lua_class_t *, const char *,
                              lua_class_propfunc_t, lua_class_propfunc_t, lua_class_propfunc_t);
+void luaA_class_add_properties(lua_class_t *, lua_class_property_t[] , size_t);
 
 int luaA_usemetatable(lua_State *, int, int);
 int luaA_class_index(lua_State *);

common/util.h

@@ -79,6 +79,13 @@
             p_realloc(pp, *(allocnb));               \
         }                                            \
     } while (0)
+#define p_growx(pp, goalnb, allocnb)                 \
+    do {                                             \
+        if ((goalnb) > *(allocnb)) {                 \
+            *(allocnb) = (goalnb);                   \
+            p_realloc(pp, *(allocnb));               \
+        }                                            \
+    } while (0)
 
 #define p_delete(mem_p)                              \
     do {                                             \