[EGIT] [core/efl] master 04/04: eolian: remove the composite keyword (replaced by composites)

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=539dc642e9bc5e89ef0391ca0bf263bfc76c703c

commit 539dc642e9bc5e89ef0391ca0bf263bfc76c703c
Author: Daniel Kolesa <d.kol...@samsung.com>
Date:   Thu Sep 19 18:17:37 2019 +0200

    eolian: remove the composite keyword (replaced by composites)
---
 src/lib/eolian/eo_lexer.h  | 2 +-
 src/lib/eolian/eo_parser.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 0746e79bae..e6ab8da0bd 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -27,7 +27,7 @@ enum Tokens
  */
 #define KEYWORDS KW(class), KW(const), KW(enum), KW(return), KW(struct), \
     \
-    KW(abstract), KW(c_prefix), KW(composite), KW(composites), 
KW(constructor), KW(constructors), \
+    KW(abstract), KW(c_prefix), KW(composites), KW(constructor), 
KW(constructors), \
     KW(data), KW(destructor), KW(error), KW(event_prefix), KW(events), 
KW(extends), \
     KW(free), KW(get), KW(implements), KW(import), KW(interface), \
     KW(keys), KW(legacy), KW(methods), KW(mixin), KW(params), \
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index c403305a2f..879cc0af3a 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -2318,7 +2318,7 @@ tags_done:
              while (test_next(ls, ','));
           }
 
-        if (ls->t.kw == KW_composite || ls->t.kw == KW_composites)
+        if (ls->t.kw == KW_composites)
           {
              if (type == EOLIAN_CLASS_INTERFACE)
                 eo_lexer_syntax_error(ls, "interfaces cannot composite");

--