djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

py/lexer: Remove unnecessary code, and unreachable code.

Browse Source 
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.
This commit is contained in:
Damien George 2016-10-12 11:00:17 +11:00
parent deaa57acf3
commit 31101d91ce
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
py/lexer.c
View File

@ -343,7 +343,6 @@ STATIC void mp_lexer_next_token_into(mp_lexer_t *lex, bool first_token) {
lex->tok_kind = MP_TOKEN_NEWLINE; lex->tok_kind = MP_TOKEN_NEWLINE;
mp_uint_t num_spaces = lex->column - 1; mp_uint_t num_spaces = lex->column - 1;
lex->emit_dent = 0;
if (num_spaces == indent_top(lex)) { if (num_spaces == indent_top(lex)) {
} else if (num_spaces > indent_top(lex)) { } else if (num_spaces > indent_top(lex)) {
indent_push(lex, num_spaces); 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)) { } else if (is_end(lex)) {
if (indent_top(lex) > 0) { lex->tok_kind = MP_TOKEN_END;
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;
}
} else if (is_char_or(lex, '\'', '\"') } else if (is_char_or(lex, '\'', '\"')
|| (is_char_or3(lex, 'r', 'u', 'b') && is_char_following_or(lex, '\'', '\"')) || (is_char_or3(lex, 'r', 'u', 'b') && is_char_following_or(lex, '\'', '\"'))