dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

eolian: simplify the lexer (remove custom ident chars)

This commit is contained in:
Daniel Kolesa 2014-07-16 14:46:38 +01:00
parent e2bab9ed2c
commit 9b2680ad6f
2 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/lib/eolian/eo_lexer.c
View File

@ -197,7 +197,7 @@ read_long_comment(Eo_Lexer *ls, const char **value)
}
static int
lex(Eo_Lexer *ls, const char **value, int *kwid, const char *chars)
lex(Eo_Lexer *ls, const char **value, int *kwid)
{
eina_strbuf_reset(ls->buff);
for (;;) switch (ls->current)
@ -235,8 +235,7 @@ lex(Eo_Lexer *ls, const char **value, int *kwid, const char *chars)
continue;
}
if (ls->current && (isalnum(ls->current)
|| ls->current == '@'
|| strchr(chars, ls->current)))
|| ls->current == '@' || ls->current == '_'))
{
int col = ls->column;
Eina_Bool at_kw = (ls->current == '@');
@ -248,7 +247,7 @@ lex(Eo_Lexer *ls, const char **value, int *kwid, const char *chars)
next_char(ls);
}
while (ls->current && (isalnum(ls->current)
|| strchr(chars, ls->current)));
|| ls->current == '_'));
str = eina_strbuf_string_get(ls->buff);
*kwid = (int)(uintptr_t)eina_hash_find(keyword_map,
str);
@ -405,27 +404,6 @@ eo_lexer_get_until(Eo_Lexer *ls, char end)
int
eo_lexer_get(Eo_Lexer *ls)
{
return eo_lexer_get_ident(ls, "_");
}
int
eo_lexer_lookahead(Eo_Lexer *ls)
{
return eo_lexer_lookahead_ident(ls, "_");
}
int
eo_lexer_lookahead_ident(Eo_Lexer *ls, const char *chars)
{
assert (ls->lookahead.token == TOK_EOF);
ls->lookahead.kw = 0;
return (ls->lookahead.token = lex(ls, &ls->lookahead.value,
&ls->lookahead.kw, chars));
}
int
eo_lexer_get_ident(Eo_Lexer *ls, const char *chars)
{
if (ls->lookahead.token != TOK_EOF)
{
@ -434,7 +412,16 @@ eo_lexer_get_ident(Eo_Lexer *ls, const char *chars)
return ls->t.token;
}
ls->t.kw = 0;
return (ls->t.token = lex(ls, &ls->t.value, &ls->t.kw, chars));
return (ls->t.token = lex(ls, &ls->t.value, &ls->t.kw));
}
int
eo_lexer_lookahead(Eo_Lexer *ls)
{
assert (ls->lookahead.token == TOK_EOF);
ls->lookahead.kw = 0;
return (ls->lookahead.token = lex(ls, &ls->lookahead.value,
&ls->lookahead.kw));
}
void

4
src/lib/eolian/eo_lexer.h
View File

@ -148,12 +148,8 @@ int eo_lexer_get_balanced (Eo_Lexer *ls, char beg, char end);
int eo_lexer_get_until (Eo_Lexer *ls, char end);
/* gets a regular token, singlechar or one of TOK_something */
int eo_lexer_get (Eo_Lexer *ls);
/* like above, but allows you to specify a list of custom characters that can
* be used as part of identifiers */
int eo_lexer_get_ident (Eo_Lexer *ls, const char *chars);
/* lookahead token - see Eo_Lexer */
int eo_lexer_lookahead (Eo_Lexer *ls);
int eo_lexer_lookahead_ident(Eo_Lexer *ls, const char *chars);
/* "throws" an error, with a custom message and custom token */
void eo_lexer_lex_error (Eo_Lexer *ls, const char *msg, int token);
/* like above, but uses the lexstate->t.token, aka current token */