summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2015-05-29 11:19:27 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2015-05-29 11:19:27 +0100
commit3efca7561558366f7deb49ddf3fa9231d7e92506 (patch)
treed59107b2ac91b6165cc9d63e43c2a532f27cf502
parent05ea7c7b551a6d590bbb2d1d34ad4909f607f5b1 (diff)
eolian: reserve __builtin_event_cb
-rw-r--r--src/lib/eolian/database_type_api.c2
-rw-r--r--src/lib/eolian/eo_lexer.c2
-rw-r--r--src/lib/eolian/eo_lexer.h2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/eolian/database_type_api.c b/src/lib/eolian/database_type_api.c
index 29f8233ab8..6ae8935a72 100644
--- a/src/lib/eolian/database_type_api.c
+++ b/src/lib/eolian/database_type_api.c
@@ -239,7 +239,7 @@ eolian_type_base_type_get(const Eolian_Type *tp)
239 * but first check for builtins 239 * but first check for builtins
240 */ 240 */
241 int kw = eo_lexer_keyword_str_to_id(tp->full_name); 241 int kw = eo_lexer_keyword_str_to_id(tp->full_name);
242 if (!kw || kw < KW_byte || kw > KW_list) 242 if (!kw || kw < KW_byte || kw >= KW_true)
243 { 243 {
244 Eolian_Declaration *decl = eina_hash_find(_decls, tp->full_name); 244 Eolian_Declaration *decl = eina_hash_find(_decls, tp->full_name);
245 if (decl && decl->type != EOLIAN_DECL_CLASS 245 if (decl && decl->type != EOLIAN_DECL_CLASS
diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c
index b0e4eb789d..9f69c7f410 100644
--- a/src/lib/eolian/eo_lexer.c
+++ b/src/lib/eolian/eo_lexer.c
@@ -803,7 +803,7 @@ eo_lexer_keyword_str_get(int kw)
803Eina_Bool 803Eina_Bool
804eo_lexer_is_type_keyword(int kw) 804eo_lexer_is_type_keyword(int kw)
805{ 805{
806 return (kw >= KW_byte && kw <= KW_list); 806 return (kw >= KW_byte && kw <= KW_true);
807} 807}
808 808
809int 809int
diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h
index 2afb8148dc..3812d47753 100644
--- a/src/lib/eolian/eo_lexer.h
+++ b/src/lib/eolian/eo_lexer.h
@@ -52,6 +52,8 @@ enum Tokens
52 \ 52 \
53 KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), \ 53 KW(accessor), KW(array), KW(iterator), KW(hash), KW(list), \
54 \ 54 \
55 KW(__builtin_event_cb), \
56 \
55 KW(true), KW(false), KW(null) 57 KW(true), KW(false), KW(null)
56 58
57/* "regular" keyword and @ prefixed keyword */ 59/* "regular" keyword and @ prefixed keyword */