[EGIT] [core/efl] master 01/01: eolian: fix unary expression parsing (correctly consume tokens)

[Daniel Kolesa]

q66 pushed a commit to branch master.

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

commit 4a14bbd0f5cadf35b177e4d16515122bf7d702ec
Author: Daniel Kolesa <d.kol...@samsung.com>
Date:   Thu Jan 29 11:12:04 2015 +0000

    eolian: fix unary expression parsing (correctly consume tokens)
    
    Also disable typed expression validation for now. The interfaces are not
    finished yet so some things will fail validation because of unexistent
    type definitions.
    
    Fixes T2064.
    
    @fix
---
 src/lib/eolian/database_validate.c | 9 ++++++++-
 src/lib/eolian/eo_parser.c         | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/lib/eolian/database_validate.c 
b/src/lib/eolian/database_validate.c
index 43b1c4a..224d916 100644
--- a/src/lib/eolian/database_validate.c
+++ b/src/lib/eolian/database_validate.c
@@ -128,8 +128,15 @@ _validate_expr(const Eolian_Expression *expr, const 
Eolian_Type *tp,
                Eolian_Expression_Mask msk)
 {
    Eolian_Value val;
+   /* TODO: enable later, for now we can't (unfinished interfaces */
    if (tp)
-      val = eolian_expression_eval_type(expr, tp);
+     {
+#if 0
+        val = eolian_expression_eval_type(expr, tp);
+#else
+        return EINA_TRUE;
+#endif
+     }
    else
       val = eolian_expression_eval(expr, msk);
    return (val.type != EOLIAN_EXPR_UNKNOWN);
diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c
index 9673c03..f01fe83 100644
--- a/src/lib/eolian/eo_parser.c
+++ b/src/lib/eolian/eo_parser.c
@@ -316,6 +316,7 @@ parse_expr_simple(Eo_Lexer *ls)
    if (unop >= 0)
      {
         int line = ls->line_number, col = ls->column;
+        eo_lexer_get(ls);
         Eolian_Expression *exp = parse_expr_bin(ls, UNARY_PRECEDENCE);
         pop_expr(ls);
         expr = push_expr(ls);

--