diff options
author | Damien George <damien.p.george@gmail.com> | 2014-04-08 11:04:29 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2014-04-08 11:04:29 +0000 |
commit | 97790455fe10c5fb22bc3edde2b43474ce0dbaad (patch) | |
tree | b887205c456731d7f4d92837d6ab19be183bb16f /stm/pyexec.c | |
parent | 72d70cb0455c61ee963d9063bd42a8b0f6c80789 (diff) | |
download | micropython-97790455fe10c5fb22bc3edde2b43474ce0dbaad.tar.gz micropython-97790455fe10c5fb22bc3edde2b43474ce0dbaad.zip |
Improve REPL detecting when input needs to continue.
Full CPython compatibility with this requires actually parsing the
input so far collected, and if it fails parsing due to lack of tokens,
then continue collecting input. It's not worth doing it this way. Not
having compatibility at this level does not hurt the goals of Micro
Python.
Diffstat (limited to 'stm/pyexec.c')
-rw-r--r-- | stm/pyexec.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/stm/pyexec.c b/stm/pyexec.c index f3dfd70aab..52a436218e 100644 --- a/stm/pyexec.c +++ b/stm/pyexec.c @@ -283,15 +283,12 @@ void pyexec_repl(void) { continue; } - if (mp_repl_is_compound_stmt(vstr_str(&line))) { - for (;;) { - vstr_add_char(&line, '\n'); - int len = vstr_len(&line); - int ret = readline(&line, "... "); - if (ret == VCP_CHAR_CTRL_D || vstr_len(&line) == len) { - // done entering compound statement - break; - } + while (mp_repl_continue_with_input(vstr_str(&line))) { + vstr_add_char(&line, '\n'); + int ret = readline(&line, "... "); + if (ret == VCP_CHAR_CTRL_D) { + // stop entering compound statement + break; } } |