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

py/repl: Don't look inside strings for unmatched brackets/quotes.

Browse Source 
When looking to see if the REPL input needs to be continued on the next
line, don't look inside strings for unmatched ()[]{} ''' or """.

Addresses issue #1387.
This commit is contained in:
Damien George 2015-07-29 15:21:42 +00:00
parent 7ccdf8be77
commit 28596edf07
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
py/repl.c
View File

@ -59,14 +59,33 @@ bool mp_repl_continue_with_input(const char *input) {
|| str_startswith_word(input, "class") || str_startswith_word(input, "class")
; ;
// check for unmatched open bracket or triple quote // check for unmatched open bracket or quote
// TODO don't look at triple quotes inside single quotes #define Q_NONE (0)
#define Q_1_SINGLE (1)
#define Q_1_DOUBLE (2)
#define Q_3_SINGLE (3)
#define Q_3_DOUBLE (4)
int n_paren = 0; int n_paren = 0;
int n_brack = 0; int n_brack = 0;
int n_brace = 0; int n_brace = 0;
int in_triple_quote = 0; int in_quote = Q_NONE;
const char *i; const char *i;
for (i = input; *i; i++) { for (i = input; *i; i++) {
if (*i == '\'') {
if ((in_quote == Q_NONE || in_quote == Q_3_SINGLE) && i[1] == '\'' && i[2] == '\'') {
i += 2;
in_quote = Q_3_SINGLE - in_quote;
} else if (in_quote == Q_NONE || in_quote == Q_1_SINGLE) {
in_quote = Q_1_SINGLE - in_quote;
}
} else if (*i == '"') {
if ((in_quote == Q_NONE || in_quote == Q_3_DOUBLE) && i[1] == '"' && i[2] == '"') {
i += 2;
in_quote = Q_3_DOUBLE - in_quote;
} else if (in_quote == Q_NONE || in_quote == Q_1_DOUBLE) {
in_quote = Q_1_DOUBLE - in_quote;
}
} else if (in_quote == Q_NONE) {
switch (*i) { switch (*i) {
case '(': n_paren += 1; break; case '(': n_paren += 1; break;
case ')': n_paren -= 1; break; case ')': n_paren -= 1; break;
@ -74,23 +93,13 @@ bool mp_repl_continue_with_input(const char *input) {
case ']': n_brack -= 1; break; case ']': n_brack -= 1; break;
case '{': n_brace += 1; break; case '{': n_brace += 1; break;
case '}': n_brace -= 1; break; case '}': n_brace -= 1; break;
case '\'': default: break;
if (in_triple_quote != '"' && i[1] == '\'' && i[2] == '\'') {
i += 2;
in_triple_quote = '\'' - in_triple_quote;
} }
break;
case '"':
if (in_triple_quote != '\'' && i[1] == '"' && i[2] == '"') {
i += 2;
in_triple_quote = '"' - in_triple_quote;
}
break;
} }
} }
// continue if unmatched brackets or quotes // continue if unmatched brackets or quotes
if (n_paren > 0 || n_brack > 0 || n_brace > 0 || in_triple_quote != 0) { if (n_paren > 0 || n_brack > 0 || n_brace > 0 || in_quote == Q_3_SINGLE || in_quote == Q_3_DOUBLE) {
return true; return true;
} }