diff options
| author | Damien George | 2014-07-30 11:46:05 +0100 |
|---|---|---|
| committer | Damien George | 2014-07-30 11:46:05 +0100 |
| commit | 94fbe9711a1179b3c4d0eb2e9822787d90231719 (patch) | |
| tree | 8a925d2f40d088c8f8d2d0919212e64cb4426a4b /stmhal | |
| parent | 07133415d26d740b866f4542222bb92c06c863d1 (diff) | |
py: Change lexer stream API to return bytes not chars.
Lexer is now 8-bit clean inside strings.
Diffstat (limited to 'stmhal')
| -rw-r--r-- | stmhal/lexerfatfs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/stmhal/lexerfatfs.c b/stmhal/lexerfatfs.c index c578b13af..21e3a2007 100644 --- a/stmhal/lexerfatfs.c +++ b/stmhal/lexerfatfs.c @@ -36,20 +36,20 @@ typedef struct _mp_lexer_file_buf_t { FIL fp; - char buf[20]; + byte buf[20]; uint16_t len; uint16_t pos; } mp_lexer_file_buf_t; -static unichar file_buf_next_char(mp_lexer_file_buf_t *fb) { +STATIC mp_uint_t file_buf_next_byte(mp_lexer_file_buf_t *fb) { if (fb->pos >= fb->len) { if (fb->len < sizeof(fb->buf)) { - return MP_LEXER_CHAR_EOF; + return MP_LEXER_EOF; } else { UINT n; f_read(&fb->fp, fb->buf, sizeof(fb->buf), &n); if (n == 0) { - return MP_LEXER_CHAR_EOF; + return MP_LEXER_EOF; } fb->len = n; fb->pos = 0; @@ -58,7 +58,7 @@ static unichar file_buf_next_char(mp_lexer_file_buf_t *fb) { return fb->buf[fb->pos++]; } -static void file_buf_close(mp_lexer_file_buf_t *fb) { +STATIC void file_buf_close(mp_lexer_file_buf_t *fb) { f_close(&fb->fp); m_del_obj(mp_lexer_file_buf_t, fb); } @@ -74,5 +74,5 @@ mp_lexer_t *mp_lexer_new_from_file(const char *filename) { f_read(&fb->fp, fb->buf, sizeof(fb->buf), &n); fb->len = n; fb->pos = 0; - return mp_lexer_new(qstr_from_str(filename), fb, (mp_lexer_stream_next_char_t)file_buf_next_char, (mp_lexer_stream_close_t)file_buf_close); + return mp_lexer_new(qstr_from_str(filename), fb, (mp_lexer_stream_next_byte_t)file_buf_next_byte, (mp_lexer_stream_close_t)file_buf_close); } |
