summaryrefslogtreecommitdiff
path: root/py/lexer.h
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-01-15 21:23:31 +0000
committerDamien George <damien.p.george@gmail.com>2014-01-15 21:23:31 +0000
commit9528cd66d7c94d7376884a53c2080b29e9bc3a0a (patch)
tree7c3ad5d4af03b7760f7c3be4ae1a1e9555113324 /py/lexer.h
parent24224d7c72e1d6572ef0d24f08eb882dcac8dc50 (diff)
Convert parse errors to exceptions.
Parser no longer prints an error, but instead returns an exception ID and message.
Diffstat (limited to 'py/lexer.h')
-rw-r--r--py/lexer.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/py/lexer.h b/py/lexer.h
index 428ff03c5..ea928c77f 100644
--- a/py/lexer.h
+++ b/py/lexer.h
@@ -124,8 +124,6 @@ typedef void (*mp_lexer_stream_close_t)(void*);
typedef struct _mp_lexer_t mp_lexer_t;
void mp_token_show(const mp_token_t *tok);
-void mp_token_show_error_prefix(const mp_token_t *tok);
-bool mp_token_show_error(const mp_token_t *tok, const char *msg);
mp_lexer_t *mp_lexer_new(const char *src_name, void *stream_data, mp_lexer_stream_next_char_t stream_next_char, mp_lexer_stream_close_t stream_close);
mp_lexer_t *mp_lexer_new_from_str_len(const char *src_name, const char *str, uint len, uint free_len);
@@ -134,12 +132,8 @@ void mp_lexer_free(mp_lexer_t *lex);
void mp_lexer_to_next(mp_lexer_t *lex);
const mp_token_t *mp_lexer_cur(const mp_lexer_t *lex);
bool mp_lexer_is_kind(mp_lexer_t *lex, mp_token_kind_t kind);
-/* unused
-bool mp_lexer_is_str(mp_lexer_t *lex, const char *str);
-bool mp_lexer_opt_kind(mp_lexer_t *lex, mp_token_kind_t kind);
-bool mp_lexer_opt_str(mp_lexer_t *lex, const char *str);
-*/
-bool mp_lexer_show_error(mp_lexer_t *lex, const char *msg);
+
+bool mp_lexer_show_error_pythonic_prefix(mp_lexer_t *lex);
bool mp_lexer_show_error_pythonic(mp_lexer_t *lex, const char *msg);
// used to import a module; must be implemented for a specific port