q66 pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f510b6de721a8eb5911b7e077b40c3bad8904ce6
commit f510b6de721a8eb5911b7e077b40c3bad8904ce6 Author: Daniel Kolesa <[email protected]> Date: Mon Jul 14 16:25:26 2014 +0100 eolian: schar and uchar are now called byte and ubyte, char stays Here, 'char' represents an actual character and is meant to be treated as so by generators. The byte types represent a numerical value and should be treated numerically. --- src/lib/eolian/eo_lexer.c | 9 ++++----- src/lib/eolian/eo_lexer.h | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lib/eolian/eo_lexer.c b/src/lib/eolian/eo_lexer.c index 6983a9f..d75d411 100644 --- a/src/lib/eolian/eo_lexer.c +++ b/src/lib/eolian/eo_lexer.c @@ -51,9 +51,8 @@ static const char * const tokens[] = static const char * const ctypes[] = { - "char", "unsigned char", "signed char", "short", "unsigned short", - "int", "unsigned int", "long", "unsigned long", "long long", - "unsigned long long", + "signed char", "unsigned char", "char", "short", "unsigned short", "int", + "unsigned int", "long", "unsigned long", "long long", "unsigned long long", "int8_t", "uint8_t", "int16_t", "uint16_t", "int32_t", "uint32_t", "int64_t", "uint64_t", "int128_t", "uint128_t", @@ -480,14 +479,14 @@ eo_lexer_keyword_str_get(int kw) Eina_Bool eo_lexer_is_type_keyword(int kw) { - return (kw >= KW_char && kw <= KW_void); + return (kw >= KW_byte && kw <= KW_void); } const char * eo_lexer_get_c_type(int kw) { if (!eo_lexer_is_type_keyword(kw)) return NULL; - return ctypes[kw - KW_char]; + return ctypes[kw - KW_byte]; } static int _init_counter = 0; diff --git a/src/lib/eolian/eo_lexer.h b/src/lib/eolian/eo_lexer.h index e569a81..e5fdc4e 100644 --- a/src/lib/eolian/eo_lexer.h +++ b/src/lib/eolian/eo_lexer.h @@ -24,7 +24,7 @@ enum Tokens KW(type), KW(values), KWAT(in), KWAT(inout), KWAT(nonull), KWAT(out), \ KWAT(warn_unused), \ \ - KW(char), KW(uchar), KW(schar), KW(short), KW(ushort), KW(int), KW(uint), \ + KW(byte), KW(ubyte), KW(char), KW(short), KW(ushort), KW(int), KW(uint), \ KW(long), KW(ulong), KW(llong), KW(ullong), \ \ KW(int8), KW(uint8), KW(int16), KW(uint16), KW(int32), KW(uint32), \ --
