eolian: inherit composite lists and allow in abstracts/mixins

There isn't any more logic necessary because checks are still only
done on regular classes; we just need to make sure that composite
lists from its inheritance tree are accounted for.

diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c
index 426f47a..3519117 100644 (file)
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -942,6 +942,24 @@ _db_swap_inherit(Eolian_Class *cl, Eina_Bool succ, Eina_Stringshare *in_cl,
    return succ;
 }
 
+/* this is so we can inherit composite lists into regular classes
+ * it doesn't need to be recursive since the parent/extension already
+ * has its composite stuff filled in from before
+ */
+static void
+_add_composite(Eolian_Class *cl, const Eolian_Class *icl, Eina_Hash *ch)
+{
+   const Eolian_Class *ccl;
+   Eina_List *l;
+   EINA_LIST_FOREACH(icl->composite, l, ccl)
+     {
+        if (eina_hash_find(ch, &ccl))
+          continue;
+        cl->composite = eina_list_append(cl->composite, ccl);
+        eina_hash_add(ch, &ccl, ccl);
+     }
+}
+
 static Eina_Bool
 _db_fill_inherits(Validate_State *vals, Eolian_Class *cl, Eina_Hash *fhash)
 {
@@ -1008,6 +1026,7 @@ _db_fill_inherits(Validate_State *vals, Eolian_Class *cl, Eina_Hash *fhash)
    /* a set of interfaces for quick checks */
    Eina_Hash *ch = eina_hash_pointer_new(NULL);
 
+   /* replace the composite list with real instances and initial-fill the hash */
    il = cl->composite;
    cl->composite = NULL;
    EINA_LIST_FREE(il, inn)
@@ -1020,6 +1039,18 @@ _db_fill_inherits(Validate_State *vals, Eolian_Class *cl, Eina_Hash *fhash)
         eina_hash_set(ch, &out_cl, out_cl);
      }
 
+   /* parent can be abstract, those are not checked for unimplemented,
+    * plus later we'll be exposing composite as an API, so we need to add
+    * all composite interfaces from everywhere in the inheritance tree anyway
+    */
+   if (cl->parent)
+     _add_composite(cl, cl->parent, ch);
+
+   /* iterate extensions, add any composite stuff into the hash as well */
+   Eolian_Class *icl;
+   EINA_LIST_FOREACH(cl->extends, il, icl)
+     _add_composite(cl, icl, ch);
+
    /* failed on the way, no point in filling further
     * the failed stuff will get dropped so it's ok if it's inconsistent
     */
@@ -1056,7 +1087,6 @@ _db_fill_inherits(Validate_State *vals, Eolian_Class *cl, Eina_Hash *fhash)
    if (cl->parent)
      _db_fill_callables(cl, cl->parent, fh, EINA_TRUE);
 
-   Eolian_Class *icl;
    EINA_LIST_FOREACH(cl->extends, il, icl)
      _db_fill_callables(cl, icl, fh, EINA_FALSE);
 

diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index b3d117d..fe5d153 100644 (file)
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -1819,8 +1819,8 @@ static void
 parse_composite(Eo_Lexer *ls)
 {
    int line, col;
-   if (ls->klass->type != EOLIAN_CLASS_REGULAR)
-     eo_lexer_syntax_error(ls, "composite section only allowed in regular classes");
+   if (ls->klass->type == EOLIAN_CLASS_INTERFACE)
+     eo_lexer_syntax_error(ls, "composite section not allowed in interfaces");
    eo_lexer_get(ls);
    line = ls->line_number, col = ls->column;
    check_next(ls, '{');