diff options
author | Daniel Kolesa <d.kolesa@samsung.com> | 2014-07-18 10:47:07 +0100 |
---|---|---|
committer | Daniel Kolesa <d.kolesa@samsung.com> | 2014-08-04 16:35:08 +0100 |
commit | 79e309f2591f59890603e41bbceaf154ce7ed9d9 (patch) | |
tree | 26c0760be16496c4e3999d3d113ec9ab355a41ad | |
parent | b0c10eeb8183b93a9d9cce2702cedf5b220f61f1 (diff) | |
download | efl-79e309f2591f59890603e41bbceaf154ce7ed9d9.tar.gz |
eolian: rename public enum members to a namespaced form
-rw-r--r-- | src/lib/eolian/Eolian.h | 50 | ||||
-rw-r--r-- | src/lib/eolian/eo_parser.c | 44 |
2 files changed, 47 insertions, 47 deletions
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h index fd69c784ee..f8d99714d0 100644 --- a/src/lib/eolian/Eolian.h +++ b/src/lib/eolian/Eolian.h @@ -153,36 +153,36 @@ typedef enum typedef enum { - BOP_ADD, /* + */ - BOP_SUB, /* - */ - BOP_MUL, /* * */ - BOP_DIV, /* / */ - BOP_MOD, /* % */ - - BOP_EQ, /* == */ - BOP_NQ, /* != */ - BOP_GT, /* > */ - BOP_LT, /* < */ - BOP_GE, /* >= */ - BOP_LE, /* <= */ - - BOP_AND, /* && */ - BOP_OR, /* || */ - - BOP_BAND, /* & */ - BOP_BOR, /* | */ - BOP_BXOR, /* ^ */ - BOP_LSH, /* << */ - BOP_RSH /* >> */ + EOLIAN_BINOP_ADD, /* + */ + EOLIAN_BINOP_SUB, /* - */ + EOLIAN_BINOP_MUL, /* * */ + EOLIAN_BINOP_DIV, /* / */ + EOLIAN_BINOP_MOD, /* % */ + + EOLIAN_BINOP_EQ, /* == */ + EOLIAN_BINOP_NQ, /* != */ + EOLIAN_BINOP_GT, /* > */ + EOLIAN_BINOP_LT, /* < */ + EOLIAN_BINOP_GE, /* >= */ + EOLIAN_BINOP_LE, /* <= */ + + EOLIAN_BINOP_AND, /* && */ + EOLIAN_BINOP_OR, /* || */ + + EOLIAN_BINOP_BAND, /* & */ + EOLIAN_BINOP_BOR, /* | */ + EOLIAN_BINOP_BXOR, /* ^ */ + EOLIAN_BINOP_LSH, /* << */ + EOLIAN_BINOP_RSH /* >> */ } Eolian_Binary_Operator; typedef enum { - UOP_UNM, /* - */ - UOP_UNP, /* + */ + EOLIAN_UNOP_UNM, /* - */ + EOLIAN_UNOP_UNP, /* + */ - UOP_NOT, /* ! */ - UOP_BNOT, /* ~ */ + EOLIAN_UNOP_NOT, /* ! */ + EOLIAN_UNOP_BNOT, /* ~ */ } Eolian_Unary_Operator; /* diff --git a/src/lib/eolian/eo_parser.c b/src/lib/eolian/eo_parser.c index 1c9f3af4b2..f5422c1e09 100644 --- a/src/lib/eolian/eo_parser.c +++ b/src/lib/eolian/eo_parser.c @@ -242,28 +242,28 @@ get_binop_id(int tok) { switch (tok) { - case '+': return BOP_ADD; - case '-': return BOP_SUB; - case '*': return BOP_MUL; - case '/': return BOP_DIV; - case '%': return BOP_MOD; + case '+': return EOLIAN_BINOP_ADD; + case '-': return EOLIAN_BINOP_SUB; + case '*': return EOLIAN_BINOP_MUL; + case '/': return EOLIAN_BINOP_DIV; + case '%': return EOLIAN_BINOP_MOD; - case TOK_EQ: return BOP_EQ; - case TOK_NQ: return BOP_NQ; - case TOK_GT: return BOP_GT; - case TOK_LT: return BOP_LT; - case TOK_GE: return BOP_GE; - case TOK_LE: return BOP_LE; + case TOK_EQ: return EOLIAN_BINOP_EQ; + case TOK_NQ: return EOLIAN_BINOP_NQ; + case TOK_GT: return EOLIAN_BINOP_GT; + case TOK_LT: return EOLIAN_BINOP_LT; + case TOK_GE: return EOLIAN_BINOP_GE; + case TOK_LE: return EOLIAN_BINOP_LE; - case TOK_AND: return BOP_AND; - case TOK_OR : return BOP_OR; + case TOK_AND: return EOLIAN_BINOP_AND; + case TOK_OR : return EOLIAN_BINOP_OR; - case '&': return BOP_BAND; - case '|': return BOP_BOR; - case '^': return BOP_BXOR; + case '&': return EOLIAN_BINOP_BAND; + case '|': return EOLIAN_BINOP_BOR; + case '^': return EOLIAN_BINOP_BXOR; - case TOK_LSH: return BOP_LSH; - case TOK_RSH: return BOP_RSH; + case TOK_LSH: return EOLIAN_BINOP_LSH; + case TOK_RSH: return EOLIAN_BINOP_RSH; default: return -1; } @@ -274,10 +274,10 @@ get_unop_id(int tok) { switch (tok) { - case '-': return UOP_UNM; - case '+': return UOP_UNP; - case '!': return UOP_NOT; - case '~': return UOP_BNOT; + case '-': return EOLIAN_UNOP_UNM; + case '+': return EOLIAN_UNOP_UNP; + case '!': return EOLIAN_UNOP_NOT; + case '~': return EOLIAN_UNOP_BNOT; default: return -1; } |