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

py/compile: Simplify syntax-error messages for illegal assignments. 

With this patch all illegal assignments are reported as "can't assign to
expression".  Before the patch there were special cases for a literal on
the LHS, and for augmented assignments (eg +=), but it seems a waste of
bytes (and there are lots of bytes used in error messages) to spend on
distinguishing such errors which a user will rarely encounter.
This commit is contained in:
Damien George 2017-03-29 12:28:33 +11:00
parent 5010d1958f
commit f55a059e7a
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
py/compile.c
View File

@ -456,8 +456,7 @@ STATIC void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t assign_
break; break;
} }
} else { } else {
compile_syntax_error(comp, pn, "can't assign to literal"); goto cannot_assign;
return;
} }
} else { } else {
// pn must be a struct // pn must be a struct
@ -472,7 +471,7 @@ STATIC void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t assign_
case PN_exprlist: case PN_exprlist:
// lhs is a tuple // lhs is a tuple
if (assign_kind != ASSIGN_STORE) { if (assign_kind != ASSIGN_STORE) {
goto bad_aug; goto cannot_assign;
} }
c_assign_tuple(comp, MP_PARSE_NODE_NULL, MP_PARSE_NODE_STRUCT_NUM_NODES(pns), pns->nodes); c_assign_tuple(comp, MP_PARSE_NODE_NULL, MP_PARSE_NODE_STRUCT_NUM_NODES(pns), pns->nodes);
break; break;
@ -485,7 +484,7 @@ STATIC void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t assign_
} else { } else {
assert(MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[0], PN_testlist_comp)); assert(MP_PARSE_NODE_IS_STRUCT_KIND(pns->nodes[0], PN_testlist_comp));
if (assign_kind != ASSIGN_STORE) { if (assign_kind != ASSIGN_STORE) {
goto bad_aug; goto cannot_assign;
} }
pns = (mp_parse_node_struct_t*)pns->nodes[0]; pns = (mp_parse_node_struct_t*)pns->nodes[0];
goto testlist_comp; goto testlist_comp;
@ -495,7 +494,7 @@ STATIC void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t assign_
case PN_atom_bracket: case PN_atom_bracket:
// lhs is something in brackets // lhs is something in brackets
if (assign_kind != ASSIGN_STORE) { if (assign_kind != ASSIGN_STORE) {
goto bad_aug; goto cannot_assign;
} }
if (MP_PARSE_NODE_IS_NULL(pns->nodes[0])) { if (MP_PARSE_NODE_IS_NULL(pns->nodes[0])) {
// empty list, assignment allowed // empty list, assignment allowed
@ -543,10 +542,6 @@ STATIC void c_assign(compiler_t *comp, mp_parse_node_t pn, assign_kind_t assign_
cannot_assign: cannot_assign:
compile_syntax_error(comp, pn, "can't assign to expression"); compile_syntax_error(comp, pn, "can't assign to expression");
return;
bad_aug:
compile_syntax_error(comp, pn, "illegal expression for augmented assignment");
} }
// stuff for lambda and comprehensions and generators: // stuff for lambda and comprehensions and generators: