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

py/scope: Add assert to check that low numbered qstrs do fit in uint8_t.

This commit is contained in:
Romain Goyet 2020-04-10 16:09:29 -04:00 committed by Damien George
parent 7654907e1e
commit bd63c26dd5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
py/scope.c
View File

@ -30,7 +30,7 @@
#if MICROPY_ENABLE_COMPILER #if MICROPY_ENABLE_COMPILER
// these low numbered qstrs should fit in 8 bits // These low numbered qstrs should fit in 8 bits. See assertions below.
STATIC const uint8_t scope_simple_name_table[] = { STATIC const uint8_t scope_simple_name_table[] = {
[SCOPE_MODULE] = MP_QSTR__lt_module_gt_, [SCOPE_MODULE] = MP_QSTR__lt_module_gt_,
[SCOPE_LAMBDA] = MP_QSTR__lt_lambda_gt_, [SCOPE_LAMBDA] = MP_QSTR__lt_lambda_gt_,
@ -41,6 +41,14 @@ STATIC const uint8_t scope_simple_name_table[] = {
}; };
scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, qstr source_file, mp_uint_t emit_options) { scope_t *scope_new(scope_kind_t kind, mp_parse_node_t pn, qstr source_file, mp_uint_t emit_options) {
// Make sure those qstrs indeed fit in an uint8_t.
MP_STATIC_ASSERT(MP_QSTR__lt_module_gt_ <= UINT8_MAX);
MP_STATIC_ASSERT(MP_QSTR__lt_lambda_gt_ <= UINT8_MAX);
MP_STATIC_ASSERT(MP_QSTR__lt_listcomp_gt_ <= UINT8_MAX);
MP_STATIC_ASSERT(MP_QSTR__lt_dictcomp_gt_ <= UINT8_MAX);
MP_STATIC_ASSERT(MP_QSTR__lt_setcomp_gt_ <= UINT8_MAX);
MP_STATIC_ASSERT(MP_QSTR__lt_genexpr_gt_ <= UINT8_MAX);
scope_t *scope = m_new0(scope_t, 1); scope_t *scope = m_new0(scope_t, 1);
scope->kind = kind; scope->kind = kind;
scope->pn = pn; scope->pn = pn;