Skip to content

Commit 511c083

Browse files
dpgeorgedpgeorge
committed
py/lexer: Rewrite mp_lexer_new_from_str_len in terms of mp_reader_mem.
1 parent 6b239c2 commit 511c083

3 files changed

Lines changed: 9 additions & 66 deletions

File tree

‎py/lexer.c‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <assert.h>
2929

3030
#include "py/mpstate.h"
31+
#include "py/reader.h"
3132
#include "py/lexer.h"
3233
#include "py/runtime.h"
3334

@@ -750,6 +751,14 @@ mp_lexer_t *mp_lexer_new(qstr src_name, void *stream_data, mp_lexer_stream_next_
750751
return lex;
751752
}
752753

754+
mp_lexer_t *mp_lexer_new_from_str_len(qstr src_name, const char *str, mp_uint_t len, mp_uint_t free_len) {
755+
mp_reader_t reader;
756+
if (!mp_reader_new_mem(&reader, (const byte*)str, len, free_len)) {
757+
return NULL;
758+
}
759+
return mp_lexer_new(src_name, reader.data, (mp_lexer_stream_next_byte_t)reader.readbyte, (mp_lexer_stream_close_t)reader.close);
760+
}
761+
753762
void mp_lexer_free(mp_lexer_t *lex) {
754763
if (lex) {
755764
if (lex->stream_close) {

‎py/lexerstr.c‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎py/py.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ PY_O_BASENAME = \
115115
mpz.o \
116116
reader.o \
117117
lexer.o \
118-
lexerstr.o \
119118
lexerunix.o \
120119
parse.o \
121120
scope.o \

0 commit comments

Comments
 (0)