[EGIT] [core/efl] master 01/01: eolian: less code repeating

[Daniel Kolesa]

q66 pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=4dcd45b010c956046e073ca39a45637ecf7eb447

commit 4dcd45b010c956046e073ca39a45637ecf7eb447
Author: Daniel Kolesa <d.kol...@samsung.com>
Date:   Fri Jun 20 15:46:00 2014 +0100

    eolian: less code repeating
---
 src/lib/eolian/eo_parser.c | 37 ++++++++++++-------------------------
 1 file changed, 12 insertions(+), 25 deletions(-)

diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index ae14817..bf00c8f 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -9,6 +9,13 @@
       eo_lexer_syntax_error(ls, "double " msg); \
    has_##var = EINA_TRUE;
 
+#define PARSE_SECTION \
+   int line; \
+   eo_lexer_get(ls); \
+   line = ls->line_number; \
+   check_next(ls, '{'); \
+   while (ls->t.token != '}')
+
 static void
 error_expected(Eo_Lexer *ls, int token)
 {
@@ -409,11 +416,7 @@ end:
 static void
 parse_params(Eo_Lexer *ls, Eina_Bool allow_inout)
 {
-   int line;
-   eo_lexer_get(ls);
-   line = ls->line_number;
-   check_next(ls, '{');
-   while (ls->t.token != '}')
+   PARSE_SECTION
      {
         parse_param(ls, allow_inout);
         ls->tmp.params = eina_list_append(ls->tmp.params, ls->tmp.param);
@@ -676,11 +679,7 @@ parse_event(Eo_Lexer *ls)
 static void
 parse_constructors(Eo_Lexer *ls)
 {
-   int line;
-   eo_lexer_get(ls);
-   line = ls->line_number;
-   check_next(ls, '{');
-   while (ls->t.token != '}')
+   PARSE_SECTION
      {
         parse_method(ls, EINA_TRUE);
         ls->tmp.kls->constructors = eina_list_append(ls->tmp.kls->constructors,
@@ -693,11 +692,7 @@ parse_constructors(Eo_Lexer *ls)
 static void
 parse_methods(Eo_Lexer *ls)
 {
-   int line;
-   eo_lexer_get(ls);
-   line = ls->line_number;
-   check_next(ls, '{');
-   while (ls->t.token != '}')
+   PARSE_SECTION
      {
         parse_method(ls, EINA_FALSE);
         ls->tmp.kls->methods = eina_list_append(ls->tmp.kls->methods,
@@ -710,11 +705,7 @@ parse_methods(Eo_Lexer *ls)
 static void
 parse_properties(Eo_Lexer *ls)
 {
-   int line;
-   eo_lexer_get(ls);
-   line = ls->line_number;
-   check_next(ls, '{');
-   while (ls->t.token != '}')
+   PARSE_SECTION
      {
         parse_property(ls);
         ls->tmp.kls->properties = eina_list_append(ls->tmp.kls->properties,
@@ -727,11 +718,7 @@ parse_properties(Eo_Lexer *ls)
 static void
 parse_implements(Eo_Lexer *ls, Eina_Bool iface)
 {
-   int line;
-   eo_lexer_get(ls);
-   line = ls->line_number;
-   check_next(ls, '{');
-   while (ls->t.token != '}')
+   PARSE_SECTION
      {
         parse_implement(ls, iface);
         ls->tmp.kls->implements = eina_list_append(ls->tmp.kls->implements,

--