remove opt iface methods + reduce generated boilerplate

Author: funny-falcon

src/fu_util/CMakeLists.txt

@@ -14,18 +14,20 @@ target_link_libraries(fu_utils PRIVATE Threads::Threads)
 
 # Detect for installed beautiful https://github.com/ianlancetaylor/libbacktrace
 include_directories(.)
-find_library(LIBBACKTRACE backtrace)
-if(LIBBACKTRACE)
-    set(CMAKE_REQUIRED_LIBRARIES backtrace)
-    check_c_source_compiles("
-        #include <backtrace.h>
-        int main(void) {
-            struct backtrace_state *st = backtrace_create_state(NULL, 0, NULL, NULL);
-            return 0;
-        }
-    " HAVE_LIBBACKTRACE)
-    if (HAVE_LIBBACKTRACE)
-        target_compile_definitions(fu_utils PRIVATE HAVE_LIBBACKTRACE)
+if(NOT CMAKE_C_COMPILER MATCHES tcc)
+    find_library(LIBBACKTRACE backtrace)
+    if(LIBBACKTRACE)
+        set(CMAKE_REQUIRED_LIBRARIES backtrace)
+        check_c_source_compiles("
+            #include <backtrace.h>
+            int main(void) {
+                struct backtrace_state *st = backtrace_create_state(NULL, 0, NULL, NULL);
+                return 0;
+            }
+        " HAVE_LIBBACKTRACE)
+        if (HAVE_LIBBACKTRACE)
+            target_compile_definitions(fu_utils PRIVATE HAVE_LIBBACKTRACE)
+        endif()
     endif()
 endif()
 

src/fu_util/fo_obj.h

@@ -347,9 +347,6 @@ extern fobj_klass_handle_t fobj_real_klass_of(fobj_t);
 #define $ifdef(assignment, meth, self, ...) \
     fobj_ifdef(assignment, meth, (self), __VA_ARGS__)
 
-#define $iifdef(assignment, meth, iface, ...) \
-    fobj_iface_ifdef(assignment, meth, iface, __VA_ARGS__)
-
 #define $bind(iface_type, obj) 		fobj_bind(iface_type, (obj))
 #define $reduce(newiface, iface)	fobj_reduce(newiface, (iface))
 

src/fu_util/impl/fo_impl.c

@@ -180,7 +180,7 @@ fobj_klass_method_search(fobj_klass_handle_t klass, fobj_method_handle_t meth) {
 
 
 fobj__method_callback_t
-fobj_method_search(const fobj_t self, fobj_method_handle_t meth, fobj_klass_handle_t for_child) {
+fobj_method_search(const fobj_t self, fobj_method_handle_t meth, fobj_klass_handle_t for_child, bool validate) {
     fobj_header_t              *h;
     fobj_klass_handle_t         klass;
     fobj__method_callback_t     cb = {self, NULL};
@@ -191,10 +191,18 @@ fobj_method_search(const fobj_t self, fobj_method_handle_t meth, fobj_klass_hand
         ft_assert(meth != fobj__nm_mhandle(fobjDispose)());
     }
 
+    if (self == NULL) {
+        if (validate)
+            ft_assert(self != NULL, "Call '%s' on NULL object", fobj_methods[meth].name);
+        return cb;
+    }
+
     h = ((fobj_header_t*)self - 1);
     assert(h->magic == FOBJ_HEADER_MAGIC);
     klass = h->klass;
     ft_dbg_assert(klass > 0 && klass <= atload(&fobj_klasses_n));
+    ft_assert((h->flags & FOBJ_DISPOSED) == 0, "Call '%s' on disposed object '%s'",
+              fobj_methods[meth].name, fobj_klasses[klass].name);
 
     if (ft_unlikely(for_child != 0)) {
         if (ft_unlikely(ft_dbg_enabled())) {
@@ -224,6 +232,9 @@ fobj_method_implements(const fobj_t self, fobj_method_handle_t meth) {
     fobj_header_t              *h;
     fobj_klass_handle_t         klass;
 
+    if (self == NULL)
+        return false;
+
     ft_assert(fobj_global_state != FOBJ_RT_NOT_INITIALIZED);
     if (ft_dbg_enabled()) {
         ft_assert(meth > 0 && meth <= atload(&fobj_methods_n));
@@ -244,6 +255,34 @@ fobj_method_implements(const fobj_t self, fobj_method_handle_t meth) {
     return false;
 }
 
+extern void
+fobj__validate_args(fobj_method_handle_t meth,
+                    fobj_t self,
+                    const char** paramnames,
+                    const char *set,
+                    size_t cnt) {
+    fobj_header_t              *h;
+    fobj_klass_handle_t         klass;
+    size_t  i;
+
+    ft_assert(fobj_global_state != FOBJ_RT_NOT_INITIALIZED);
+    ft_assert(meth > 0 && meth <= atload(&fobj_methods_n));
+    ft_assert(meth != fobj__nm_mhandle(fobjDispose)());
+    ft_assert(self != NULL, "call '%s' on NULL object", fobj_methods[meth].name);
+
+    h = ((fobj_header_t*)self - 1);
+    assert(h->magic == FOBJ_HEADER_MAGIC);
+    klass = h->klass;
+    ft_dbg_assert(klass > 0 && klass <= atload(&fobj_klasses_n));
+
+    for (i = 0; i < cnt; i++) {
+        ft_assert(set[i] != 0, "Calling '%s' on '%s' miss argument '%s'",
+                                fobj_methods[meth].name,
+                                fobj_klasses[klass].name,
+                                paramnames[i]);
+    }
+}
+
 const char *
 fobj_klass_name(fobj_klass_handle_t klass) {
     fobj_klass_registration_t *reg;