diff options
| author | Damien George <damien.p.george@gmail.com> | 2016-10-12 11:00:17 +1100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2016-10-12 11:00:17 +1100 |
| commit | 31101d91ceb5758c17d02b7d41bffbd387cad112 (patch) | |
| tree | 6b2b9f1d1263f73f567ec523cfdbf1df8da72663 /py | |
| parent | deaa57acf3db104e2c1a54c6bf4bbd96f95583f4 (diff) | |
| download | micropython-31101d91ceb5758c17d02b7d41bffbd387cad112.tar.gz micropython-31101d91ceb5758c17d02b7d41bffbd387cad112.zip | |
py/lexer: Remove unnecessary code, and unreachable code.
Setting emit_dent=0 is unnecessary because arriving in that part of the
if-logic will guarantee that emit_dent is already zero.
The block to check indent_top(lex)>0 is unreachable because a newline is
always inserted an the end of the input stream, and hence dedents are
always processed before EOF.
Diffstat (limited to 'py')
| -rw-r--r-- | py/lexer.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/py/lexer.c b/py/lexer.c index b2c9c5ff78..4a7c8f580a 100644 --- a/py/lexer.c +++ b/py/lexer.c @@ -343,7 +343,6 @@ STATIC void mp_lexer_next_token_into(mp_lexer_t *lex, bool first_token) { lex->tok_kind = MP_TOKEN_NEWLINE; mp_uint_t num_spaces = lex->column - 1; - lex->emit_dent = 0; if (num_spaces == indent_top(lex)) { } else if (num_spaces > indent_top(lex)) { indent_push(lex, num_spaces); @@ -359,16 +358,7 @@ STATIC void mp_lexer_next_token_into(mp_lexer_t *lex, bool first_token) { } } else if (is_end(lex)) { - if (indent_top(lex) > 0) { - lex->tok_kind = MP_TOKEN_NEWLINE; - lex->emit_dent = 0; - while (indent_top(lex) > 0) { - indent_pop(lex); - lex->emit_dent -= 1; - } - } else { - lex->tok_kind = MP_TOKEN_END; - } + lex->tok_kind = MP_TOKEN_END; } else if (is_char_or(lex, '\'', '\"') || (is_char_or3(lex, 'r', 'u', 'b') && is_char_following_or(lex, '\'', '\"')) |