eolian: more cleanups

This commit is contained in:
Daniel Kolesa 2014-06-20 15:31:45 +01:00
parent eb3a7cf6d0
commit efcdfec94f
3 changed files with 21 additions and 23 deletions

View File

@ -393,6 +393,12 @@ eo_lexer_token_to_str(int token, char *buf)
}
}
const char *
eo_lexer_keyword_str_get(int kw)
{
return tokens[kw + 2];
}
static int _init_counter = 0;
int

View File

@ -59,19 +59,20 @@ typedef struct _Eo_Lexer
Eo_Lexer_Temps tmp;
} Eo_Lexer;
int eo_lexer_init (void);
int eo_lexer_shutdown (void);
Eo_Lexer *eo_lexer_new (const char *source);
void eo_lexer_free (Eo_Lexer *ls);
int eo_lexer_get_balanced (Eo_Lexer *ls, char beg, char end);
int eo_lexer_get_until (Eo_Lexer *ls, char end);
int eo_lexer_get (Eo_Lexer *ls);
int eo_lexer_get_ident (Eo_Lexer *ls, const char *chars);
int eo_lexer_lookahead (Eo_Lexer *ls);
int eo_lexer_lookahead_ident(Eo_Lexer *ls, const char *chars);
void eo_lexer_lex_error (Eo_Lexer *ls, const char *msg, int token);
void eo_lexer_syntax_error (Eo_Lexer *ls, const char *msg);
void eo_lexer_token_to_str (int token, char *buf);
int eo_lexer_init (void);
int eo_lexer_shutdown (void);
Eo_Lexer *eo_lexer_new (const char *source);
void eo_lexer_free (Eo_Lexer *ls);
int eo_lexer_get_balanced (Eo_Lexer *ls, char beg, char end);
int eo_lexer_get_until (Eo_Lexer *ls, char end);
int eo_lexer_get (Eo_Lexer *ls);
int eo_lexer_get_ident (Eo_Lexer *ls, const char *chars);
int eo_lexer_lookahead (Eo_Lexer *ls);
int eo_lexer_lookahead_ident(Eo_Lexer *ls, const char *chars);
void eo_lexer_lex_error (Eo_Lexer *ls, const char *msg, int token);
void eo_lexer_syntax_error (Eo_Lexer *ls, const char *msg);
void eo_lexer_token_to_str (int token, char *buf);
const char *eo_lexer_keyword_str_get(int kw);
extern int _eo_lexer_log_dom;
#ifdef CRITICAL

View File

@ -621,19 +621,10 @@ parse_implement(Eo_Lexer *ls, Eina_Bool iface)
switch (ls->t.kw)
{
case KW_constructor:
eina_strbuf_append(buf, "constructor");
eo_lexer_get(ls);
goto end;
case KW_destructor:
eina_strbuf_append(buf, "destructor");
eo_lexer_get(ls);
goto end;
case KW_get:
eina_strbuf_append(buf, "get");
eo_lexer_get(ls);
goto end;
case KW_set:
eina_strbuf_append(buf, "set");
eina_strbuf_append(buf, eo_lexer_keyword_str_get(ls->t.kw));
eo_lexer_get(ls);
goto end;
default: