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

py/repl: Refactor autocomplete to reduce nesting.

Browse Source 
Originally at adafruit#4548

Signed-off-by: Artyom Skrobov <tyomitch@gmail.com>
This commit is contained in:
Artyom Skrobov 2021-04-07 13:09:39 -04:00 committed by Damien George
parent befbff31b7
commit f85ea8d4fe
1 changed files with 111 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

219
py/repl.c
View File

@ -161,131 +161,134 @@ size_t mp_repl_autocomplete(const char *str, size_t len, const mp_print_t *print
mp_obj_t obj = MP_OBJ_FROM_PTR(&mp_module___main__); mp_obj_t obj = MP_OBJ_FROM_PTR(&mp_module___main__);
mp_obj_t dest[2]; mp_obj_t dest[2];
const char *s_start;
size_t s_len;
for (;;) { for (;;) {
// get next word in string to complete // get next word in string to complete
const char *s_start = str; s_start = str;
while (str < top && *str != '.') { while (str < top && *str != '.') {
++str; ++str;
} }
size_t s_len = str - s_start; s_len = str - s_start;
if (str < top) { if (str == top) {
// a complete word, lookup in current object
qstr q = qstr_find_strn(s_start, s_len);
if (q == MP_QSTRnull) {
// lookup will fail
return 0;
}
mp_load_method_protected(obj, q, dest, true);
obj = dest[0]; // attribute, method, or MP_OBJ_NULL if nothing found
if (obj == MP_OBJ_NULL) {
// lookup failed
return 0;
}
// skip '.' to move to next word
++str;
} else {
// end of string, do completion on this partial name // end of string, do completion on this partial name
break;
}
// look for matches // a complete word, lookup in current object
const char *match_str = NULL; qstr q = qstr_find_strn(s_start, s_len);
size_t match_len = 0; if (q == MP_QSTRnull) {
qstr q_first = 0, q_last = 0; // lookup will fail
for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) { return 0;
size_t d_len; }
const char *d_str = (const char *)qstr_data(q, &d_len); mp_load_method_protected(obj, q, dest, true);
// special case; filter out words that begin with underscore obj = dest[0]; // attribute, method, or MP_OBJ_NULL if nothing found
// unless there's already a partial match
if (s_len == 0 && d_str[0] == '_') {
continue;
}
if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
mp_load_method_protected(obj, q, dest, true);
if (dest[0] != MP_OBJ_NULL) {
if (match_str == NULL) {
match_str = d_str;
match_len = d_len;
} else {
// search for longest common prefix of match_str and d_str
// (assumes these strings are null-terminated)
for (size_t j = s_len; j <= match_len && j <= d_len; ++j) {
if (match_str[j] != d_str[j]) {
match_len = j;
break;
}
}
}
if (q_first == 0) {
q_first = q;
}
q_last = q;
}
}
}
// nothing found if (obj == MP_OBJ_NULL) {
if (q_first == 0) { // lookup failed
if (s_len == 0) { return 0;
*compl_str = " "; }
return 4;
}
// If there're no better alternatives, and if it's first word
// in the line, try to complete "import".
if (s_start == org_str) {
static const char import_str[] = "import ";
if (memcmp(s_start, import_str, s_len) == 0) {
*compl_str = import_str + s_len;
return sizeof(import_str) - 1 - s_len;
}
}
return 0; // skip '.' to move to next word
} ++str;
}
// 1 match found, or multiple matches with a common prefix // look for matches
if (q_first == q_last || match_len > s_len) { const char *match_str = NULL;
*compl_str = match_str + s_len; size_t match_len = 0;
return match_len - s_len; qstr q_first = 0, q_last = 0;
} for (qstr q = MP_QSTR_ + 1; q < nqstr; ++q) {
size_t d_len;
// multiple matches found, print them out const char *d_str = (const char *)qstr_data(q, &d_len);
// special case; filter out words that begin with underscore
#define WORD_SLOT_LEN (16) // unless there's already a partial match
#define MAX_LINE_LEN (4 * WORD_SLOT_LEN) if (s_len == 0 && d_str[0] == '_') {
continue;
int line_len = MAX_LINE_LEN; // force a newline for first word }
for (qstr q = q_first; q <= q_last; ++q) { if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
size_t d_len; mp_load_method_protected(obj, q, dest, true);
const char *d_str = (const char *)qstr_data(q, &d_len); if (dest[0] != MP_OBJ_NULL) {
if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) { if (match_str == NULL) {
mp_load_method_protected(obj, q, dest, true); match_str = d_str;
if (dest[0] != MP_OBJ_NULL) { match_len = d_len;
int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len; } else {
if (gap < 2) { // search for longest common prefix of match_str and d_str
gap += WORD_SLOT_LEN; // (assumes these strings are null-terminated)
} for (size_t j = s_len; j <= match_len && j <= d_len; ++j) {
if (line_len + gap + d_len <= MAX_LINE_LEN) { if (match_str[j] != d_str[j]) {
// TODO optimise printing of gap? match_len = j;
for (int j = 0; j < gap; ++j) { break;
mp_print_str(print, " ");
}
mp_print_str(print, d_str);
line_len += gap + d_len;
} else {
mp_printf(print, "\n%s", d_str);
line_len = d_len;
} }
} }
} }
if (q_first == 0) {
q_first = q;
}
q_last = q;
} }
mp_print_str(print, "\n");
return (size_t)(-1); // indicate many matches
} }
} }
// nothing found
if (q_first == 0) {
if (s_len == 0) {
*compl_str = " ";
return 4;
}
// If there're no better alternatives, and if it's first word
// in the line, try to complete "import".
if (s_start == org_str) {
static const char import_str[] = "import ";
if (memcmp(s_start, import_str, s_len) == 0) {
*compl_str = import_str + s_len;
return sizeof(import_str) - 1 - s_len;
}
}
return 0;
}
// 1 match found, or multiple matches with a common prefix
if (q_first == q_last || match_len > s_len) {
*compl_str = match_str + s_len;
return match_len - s_len;
}
// multiple matches found, print them out
#define WORD_SLOT_LEN (16)
#define MAX_LINE_LEN (4 * WORD_SLOT_LEN)
int line_len = MAX_LINE_LEN; // force a newline for first word
for (qstr q = q_first; q <= q_last; ++q) {
size_t d_len;
const char *d_str = (const char *)qstr_data(q, &d_len);
if (s_len <= d_len && strncmp(s_start, d_str, s_len) == 0) {
mp_load_method_protected(obj, q, dest, true);
if (dest[0] != MP_OBJ_NULL) {
int gap = (line_len + WORD_SLOT_LEN - 1) / WORD_SLOT_LEN * WORD_SLOT_LEN - line_len;
if (gap < 2) {
gap += WORD_SLOT_LEN;
}
if (line_len + gap + d_len <= MAX_LINE_LEN) {
// TODO optimise printing of gap?
for (int j = 0; j < gap; ++j) {
mp_print_str(print, " ");
}
mp_print_str(print, d_str);
line_len += gap + d_len;
} else {
mp_printf(print, "\n%s", d_str);
line_len = d_len;
}
}
}
}
mp_print_str(print, "\n");
return (size_t)(-1); // indicate many matches
} }
#endif // MICROPY_HELPER_REPL #endif // MICROPY_HELPER_REPL