aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Schmidt <s.schmidt@samsung.com>2019-09-19 10:39:31 +0200
committerStefan Schmidt <s.schmidt@samsung.com>2019-09-19 10:39:31 +0200
commitdba1d69121754821ba33c59f1db00cccb906b500 (patch)
treea9d47d4e746477977ee299deeaf61ff0e8d7575c
parentdoc: fix typo and indentation. (diff)
downloadefl-devs/stefan/eolian-composites-rename.tar.gz
eolian: use composites as keyword name to harmonize on third person singulardevs/stefan/eolian-composites-rename
All other keywords in the inheritance section are using third person singular. We should do the same for the newly changed composite keyword from ref eb25e927. Fixes https://phab.enlightenment.org/T8218
-rw-r--r--src/lib/elementary/efl_ui_collection.eo2
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.eo2
-rw-r--r--src/lib/elementary/efl_ui_list_view.eo2
-rw-r--r--src/lib/elementary/efl_ui_panel.eo2
-rw-r--r--src/lib/elementary/efl_ui_radio_box.eo2
-rw-r--r--src/lib/elementary/efl_ui_scroller.eo2
-rw-r--r--src/lib/elementary/efl_ui_tab_bar.eo2
-rw-r--r--src/lib/elementary/efl_ui_tags.eo2
-rw-r--r--src/lib/elementary/efl_ui_text.eo2
-rw-r--r--src/lib/elementary/efl_ui_video.eo2
-rw-r--r--src/lib/elementary/efl_ui_widget_focus_manager.eo2
-rw-r--r--src/lib/elementary/efl_ui_win.eo2
-rw-r--r--src/lib/eolian/database_class.c2
-rw-r--r--src/lib/eolian/database_validate.c16
-rw-r--r--src/lib/eolian/eo_lexer.h2
-rw-r--r--src/lib/eolian/eo_parser.c12
-rw-r--r--src/lib/eolian/eolian_database.h2
-rw-r--r--src/tests/eolian/data/unimpl.eo2
18 files changed, 30 insertions, 30 deletions
diff --git a/src/lib/elementary/efl_ui_collection.eo b/src/lib/elementary/efl_ui_collection.eo
index 30451214ad..398de5a87d 100644
--- a/src/lib/elementary/efl_ui_collection.eo
+++ b/src/lib/elementary/efl_ui_collection.eo
@@ -6,7 +6,7 @@ class @beta Efl.Ui.Collection extends Efl.Ui.Layout_Base implements
Efl.Ui.Multi_Selectable,
Efl.Ui.Focus.Manager_Sub,
Efl.Ui.Widget_Focus_Manager
- composite
+ composites
Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar,
Efl.Ui.Focus.Manager
diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo
index 932c732e15..990743ea34 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.eo
+++ b/src/lib/elementary/efl_ui_image_zoomable.eo
@@ -5,7 +5,7 @@ struct @extern Elm.Photocam.Progress; [[Photocam progress information.]]
class @beta Efl.Ui.Image_Zoomable extends Efl.Ui.Image implements Efl.Ui.Zoom,
Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar
- composite Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar
+ composites Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar
{
[[Elementary Image Zoomable class]]
methods {
diff --git a/src/lib/elementary/efl_ui_list_view.eo b/src/lib/elementary/efl_ui_list_view.eo
index 5c49394ec4..9be11470cf 100644
--- a/src/lib/elementary/efl_ui_list_view.eo
+++ b/src/lib/elementary/efl_ui_list_view.eo
@@ -10,7 +10,7 @@ struct @beta Efl.Ui.List_View_Item_Event
class @beta Efl.Ui.List_View extends Efl.Ui.Layout_Base implements Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar,
Efl.Access.Widget.Action, Efl.Access.Selection, Efl.Ui.Focus.Composition, Efl.Ui.Focus.Manager_Sub,
Efl.Ui.Container_Selectable, Efl.Ui.List_View_Model, Efl.Ui.Widget_Focus_Manager
- composite
+ composites
Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar
{
methods {
diff --git a/src/lib/elementary/efl_ui_panel.eo b/src/lib/elementary/efl_ui_panel.eo
index edf688c2eb..da3855142e 100644
--- a/src/lib/elementary/efl_ui_panel.eo
+++ b/src/lib/elementary/efl_ui_panel.eo
@@ -18,7 +18,7 @@ struct @beta Efl.Ui.Panel_Scroll_Info
class @beta Efl.Ui.Panel extends Efl.Ui.Layout_Base
implements Efl.Ui.Focus.Layer, Efl.Ui.Scrollable_Interactive, Efl.Content,
Efl.Access.Widget.Action
- composite Efl.Ui.Scrollable_Interactive
+ composites Efl.Ui.Scrollable_Interactive
{
[[Elementary panel class]]
methods {
diff --git a/src/lib/elementary/efl_ui_radio_box.eo b/src/lib/elementary/efl_ui_radio_box.eo
index 15f6b3ee13..2a8bd75fe3 100644
--- a/src/lib/elementary/efl_ui_radio_box.eo
+++ b/src/lib/elementary/efl_ui_radio_box.eo
@@ -1,5 +1,5 @@
class @beta Efl.Ui.Radio_Box extends Efl.Ui.Box implements Efl.Ui.Radio_Group
- composite Efl.Ui.Radio_Group
+ composites Efl.Ui.Radio_Group
{
[[A standard @Efl.Ui.Box container which automatically handles grouping of any @Efl.Ui.Radio
widget added to it in addition to regular widgets.
diff --git a/src/lib/elementary/efl_ui_scroller.eo b/src/lib/elementary/efl_ui_scroller.eo
index 7a2bb90306..d2ea8b07f4 100644
--- a/src/lib/elementary/efl_ui_scroller.eo
+++ b/src/lib/elementary/efl_ui_scroller.eo
@@ -4,7 +4,7 @@ class @beta Efl.Ui.Scroller extends Efl.Ui.Layout_Base implements
Efl.Ui.Focus.Manager_Sub,
Efl.Ui.Widget_Focus_Manager,
Efl.Content
- composite
+ composites
Efl.Ui.Scrollable_Interactive,
Efl.Ui.Scrollbar
{
diff --git a/src/lib/elementary/efl_ui_tab_bar.eo b/src/lib/elementary/efl_ui_tab_bar.eo
index 996a897b98..ee717da768 100644
--- a/src/lib/elementary/efl_ui_tab_bar.eo
+++ b/src/lib/elementary/efl_ui_tab_bar.eo
@@ -1,6 +1,6 @@
class @beta Efl.Ui.Tab_Bar extends Efl.Ui.Layout_Base
implements Efl.Ui.Single_Selectable, Efl.Pack_Linear
- composite Efl.Pack_Linear, Efl.Pack
+ composites Efl.Pack_Linear, Efl.Pack
{
[[A selectable box of items.
diff --git a/src/lib/elementary/efl_ui_tags.eo b/src/lib/elementary/efl_ui_tags.eo
index 29728900eb..c9485f118f 100644
--- a/src/lib/elementary/efl_ui_tags.eo
+++ b/src/lib/elementary/efl_ui_tags.eo
@@ -1,6 +1,6 @@
class @beta Efl.Ui.Tags extends Efl.Ui.Layout_Base
implements Efl.Text, Efl.Ui.Format
- composite Efl.Text
+ composites Efl.Text
{
[[A widget displaying a list of tags. The user can remove tags by clicking
on each tag "close" button and add new tags by typing text in the text
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index eb74be4b1a..d128893d07 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -4,7 +4,7 @@ import elm_general;
class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
Efl.Ui.Text_Selectable, Efl.Text_Interactive, Efl.Text_Markup
- composite
+ composites
Efl.Text_Interactive, Efl.Text_Markup
{
[[A flexible text widget which can be static (as a label) or editable by
diff --git a/src/lib/elementary/efl_ui_video.eo b/src/lib/elementary/efl_ui_video.eo
index 9cc1b43b42..e30cd9b46f 100644
--- a/src/lib/elementary/efl_ui_video.eo
+++ b/src/lib/elementary/efl_ui_video.eo
@@ -1,6 +1,6 @@
class @beta Efl.Ui.Video extends Efl.Ui.Layout_Base
implements Efl.File, Efl.Player, Efl.Access.Widget.Action
- composite Efl.Player
+ composites Efl.Player
{
[[Efl UI video class]]
methods {
diff --git a/src/lib/elementary/efl_ui_widget_focus_manager.eo b/src/lib/elementary/efl_ui_widget_focus_manager.eo
index d12a4a0c79..87b4c4bbbf 100644
--- a/src/lib/elementary/efl_ui_widget_focus_manager.eo
+++ b/src/lib/elementary/efl_ui_widget_focus_manager.eo
@@ -1,7 +1,7 @@
mixin Efl.Ui.Widget_Focus_Manager
requires Efl.Ui.Widget
extends Efl.Ui.Focus.Manager
- composite Efl.Ui.Focus.Manager
+ composites Efl.Ui.Focus.Manager
{
[[Helper mixin for widgets which also can act as focus managers.
diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo
index 6fa01b8291..79ee7aa775 100644
--- a/src/lib/elementary/efl_ui_win.eo
+++ b/src/lib/elementary/efl_ui_win.eo
@@ -139,7 +139,7 @@ class Efl.Ui.Win extends Efl.Ui.Widget implements Efl.Canvas.Scene, Efl.Access.W
Efl.Content, Efl.Input.State, Efl.Input.Interface, Efl.Screen,
Efl.Text, Efl.Config,
Efl.Ui.Widget_Focus_Manager, Efl.Ui.Focus.Manager_Window_Root
- composite Efl.Config
+ composites Efl.Config
{
[[Efl UI window class.
diff --git a/src/lib/eolian/database_class.c b/src/lib/eolian/database_class.c
index 110817cdb5..22533e929d 100644
--- a/src/lib/eolian/database_class.c
+++ b/src/lib/eolian/database_class.c
@@ -32,7 +32,7 @@ database_class_del(Eolian_Class *cl)
EINA_LIST_FREE(cl->parts, pt) database_part_del(pt);
eina_list_free(cl->requires);
eina_list_free(cl->callables);
- eina_list_free(cl->composite);
+ eina_list_free(cl->composites);
if (cl->c_prefix) eina_stringshare_del(cl->c_prefix);
if (cl->ev_prefix) eina_stringshare_del(cl->ev_prefix);
diff --git a/src/lib/eolian/database_validate.c b/src/lib/eolian/database_validate.c
index cdbd699293..ba35b000e0 100644
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -1102,15 +1102,15 @@ _db_swap_inherit(Eolian_Class *cl, Eina_Bool succ, Eina_Stringshare *in_cl,
* has its composite stuff filled in from before
*/
static void
-_add_composite(Eolian_Class *cl, const Eolian_Class *icl, Eina_Hash *ch)
+_add_composites(Eolian_Class *cl, const Eolian_Class *icl, Eina_Hash *ch)
{
const Eolian_Class *ccl;
Eina_List *l;
- EINA_LIST_FOREACH(icl->composite, l, ccl)
+ EINA_LIST_FOREACH(icl->composites, l, ccl)
{
if (eina_hash_find(ch, &ccl))
continue;
- cl->composite = eina_list_append(cl->composite, ccl);
+ cl->composites = eina_list_append(cl->composites, ccl);
eina_hash_add(ch, &ccl, ccl);
}
}
@@ -1181,15 +1181,15 @@ _db_fill_inherits(Validate_State *vals, Eolian_Class *cl, Eina_Hash *fhash,
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;
+ il = cl->composites;
+ cl->composites = NULL;
EINA_LIST_FREE(il, inn)
{
Eolian_Class *out_cl = NULL;
succ = _db_swap_inherit(cl, succ, inn, &out_cl, EINA_TRUE);
if (!succ)
continue;
- cl->composite = eina_list_append(cl->composite, out_cl);
+ cl->composites = eina_list_append(cl->composites, out_cl);
eina_hash_set(ch, &out_cl, out_cl);
}
@@ -1198,12 +1198,12 @@ _db_fill_inherits(Validate_State *vals, Eolian_Class *cl, Eina_Hash *fhash,
* all composite interfaces from everywhere in the inheritance tree anyway
*/
if (cl->parent)
- _add_composite(cl, cl->parent, ch);
+ _add_composites(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);
+ _add_composites(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
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 876f1c70bc..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(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 1f5a678215..131e63b348 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -2179,7 +2179,7 @@ _requires_add(Eo_Lexer *ls, Eina_Strbuf *buf)
}
static void
-_composite_add(Eo_Lexer *ls, Eina_Strbuf *buf)
+_composites_add(Eo_Lexer *ls, Eina_Strbuf *buf)
{
const char *oname;
char ebuf[PATH_MAX];
@@ -2190,7 +2190,7 @@ _composite_add(Eo_Lexer *ls, Eina_Strbuf *buf)
parse_name(ls, buf);
const char *nm = eina_stringshare_add(eina_strbuf_string_get(buf));
- EINA_LIST_FOREACH(ls->klass->composite, l, oname)
+ EINA_LIST_FOREACH(ls->klass->composites, l, oname)
if (nm == oname)
{
eo_lexer_context_restore(ls);
@@ -2213,7 +2213,7 @@ _composite_add(Eo_Lexer *ls, Eina_Strbuf *buf)
/* do not introduce a dependency */
database_defer(ls->state, fnm, EINA_FALSE);
free(fnm);
- ls->klass->composite = eina_list_append(ls->klass->composite, nm);
+ ls->klass->composites = eina_list_append(ls->klass->composites, nm);
eo_lexer_context_pop(ls);
}
@@ -2318,13 +2318,13 @@ tags_done:
while (test_next(ls, ','));
}
- if (ls->t.kw == KW_composite)
+ if (ls->t.kw == KW_composites)
{
if (type == EOLIAN_CLASS_INTERFACE)
- eo_lexer_syntax_error(ls, "composite not allowed in interfaces");
+ eo_lexer_syntax_error(ls, "composites not allowed in interfaces");
eo_lexer_get(ls);
do
- _composite_add(ls, ibuf);
+ _composites_add(ls, ibuf);
while (test_next(ls, ','));
}
diff --git a/src/lib/eolian/eolian_database.h b/src/lib/eolian/eolian_database.h
index ab49424cad..0a638bcff3 100644
--- a/src/lib/eolian/eolian_database.h
+++ b/src/lib/eolian/eolian_database.h
@@ -195,7 +195,7 @@ struct _Eolian_Class
Eina_List *constructors; /* Eolian_Constructor */
Eina_List *events; /* Eolian_Event */
Eina_List *parts; /* Eolian_Part */
- Eina_List *composite; /* Eolian_Class */
+ Eina_List *composites; /* Eolian_Class */
Eina_List *requires; /* a list of required other classes only used internally */
Eina_List *callables; /* internal for now */
Eina_Bool class_ctor_enable:1;
diff --git a/src/tests/eolian/data/unimpl.eo b/src/tests/eolian/data/unimpl.eo
index e08699a231..d624163634 100644
--- a/src/tests/eolian/data/unimpl.eo
+++ b/src/tests/eolian/data/unimpl.eo
@@ -1,4 +1,4 @@
-class Unimpl implements Iface composite Iface {
+class Unimpl implements Iface composites Iface {
implements {
Iface.foo;
}