diff options
Diffstat (limited to 'py')
| -rw-r--r-- | py/lexer.h | 2 | ||||
| -rw-r--r-- | py/lexerstr.c | 35 | ||||
| -rw-r--r-- | py/lexerunix.c | 36 | ||||
| -rw-r--r-- | py/lexerunix.h | 1 | ||||
| -rw-r--r-- | py/py.mk | 1 |
5 files changed, 40 insertions, 35 deletions
diff --git a/py/lexer.h b/py/lexer.h index 3cb48ce9e1..9dfcb128c5 100644 --- a/py/lexer.h +++ b/py/lexer.h @@ -127,6 +127,8 @@ 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); + 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); diff --git a/py/lexerstr.c b/py/lexerstr.c new file mode 100644 index 0000000000..b8594f4205 --- /dev/null +++ b/py/lexerstr.c @@ -0,0 +1,35 @@ +#include <stdint.h> +#include <stdio.h> + +#include "misc.h" +#include "lexer.h" + +typedef struct _mp_lexer_str_buf_t { + uint free_len; // if > 0, src_beg will be freed when done by: m_free(src_beg, free_len) + const char *src_beg; // beginning of source + const char *src_cur; // current location in source + const char *src_end; // end (exclusive) of source +} mp_lexer_str_buf_t; + +static unichar str_buf_next_char(mp_lexer_str_buf_t *sb) { + if (sb->src_cur < sb->src_end) { + return *sb->src_cur++; + } else { + return MP_LEXER_CHAR_EOF; + } +} + +static void str_buf_free(mp_lexer_str_buf_t *sb) { + if (sb->free_len > 0) { + m_free((char*)sb->src_beg, sb->free_len); + } +} + +mp_lexer_t *mp_lexer_new_from_str_len(const char *src_name, const char *str, uint len, uint free_len) { + mp_lexer_str_buf_t *sb = m_new_obj(mp_lexer_str_buf_t); + sb->free_len = free_len; + sb->src_beg = str; + sb->src_cur = str; + sb->src_end = str + len; + return mp_lexer_new(src_name, sb, (mp_lexer_stream_next_char_t)str_buf_next_char, (mp_lexer_stream_close_t)str_buf_free); +} diff --git a/py/lexerunix.c b/py/lexerunix.c index 5336610bae..225ed20a7f 100644 --- a/py/lexerunix.c +++ b/py/lexerunix.c @@ -6,42 +6,10 @@ #include "misc.h" #include "mpconfig.h" #include "lexer.h" +#include "lexerunix.h" #if MICROPY_ENABLE_LEXER_UNIX -typedef struct _str_buf_t { - bool free; // free src_beg when done - const char *src_beg; // beginning of source - const char *src_cur; // current location in source - const char *src_end; // end (exclusive) of source -} str_buf_t; - -unichar str_buf_next_char(str_buf_t *sb) { - if (sb->src_cur < sb->src_end) { - return *sb->src_cur++; - } else { - return MP_LEXER_CHAR_EOF; - } -} - -void str_buf_free(str_buf_t *sb) { - if (sb) { - if (sb->free) { - m_del(char, (char*)sb->src_beg, 0 /* unknown size of src_beg */); - } - m_del_obj(str_buf_t, sb); - } -} - -mp_lexer_t *mp_lexer_new_from_str_len(const char *src_name, const char *str, uint len, bool free_str) { - str_buf_t *sb = m_new(str_buf_t, 1); - sb->free = free_str; - sb->src_beg = str; - sb->src_cur = str; - sb->src_end = str + len; - return mp_lexer_new(src_name, sb, (mp_lexer_stream_next_char_t)str_buf_next_char, (mp_lexer_stream_close_t)str_buf_free); -} - mp_lexer_t *mp_lexer_new_from_file(const char *filename) { int fd = open(filename, O_RDONLY); if (fd < 0) { @@ -59,7 +27,7 @@ mp_lexer_t *mp_lexer_new_from_file(const char *filename) { return NULL; } - return mp_lexer_new_from_str_len(filename, data, size, true); + return mp_lexer_new_from_str_len(filename, data, size, size); } /******************************************************************************/ diff --git a/py/lexerunix.h b/py/lexerunix.h index b422a43062..3451c1c1ce 100644 --- a/py/lexerunix.h +++ b/py/lexerunix.h @@ -1,4 +1,3 @@ -mp_lexer_t *mp_lexer_new_from_str_len(const char *src_name, const char *str, uint len, bool free_str); mp_lexer_t *mp_lexer_new_from_file(const char *filename); void mp_import_set_directory(const char *dir); @@ -29,6 +29,7 @@ PY_O_BASENAME = \ vstr.o \ unicode.o \ lexer.o \ + lexerstr.o \ lexerunix.o \ parse.o \ scope.o \ |