mirror
/
micropython
kopia lustrzana https://github.com/micropython/micropython
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

py: Remove unused "use_stack" argument from for_iter_end emit function.

pull/2416/head
Damien George 2017-01-17 15:30:18 +11:00
rodzic 088740ecc4
commit 30b42dd72d
4 zmienionych plików z 8 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
py/compile.c
Wyświetl plik

@ -1484,7 +1484,7 @@ STATIC void compile_for_stmt(compiler_t *comp, mp_parse_node_struct_t *pns) {
EMIT_ARG(jump, continue_label); EMIT_ARG(jump, continue_label);
} }
EMIT_ARG(label_assign, pop_label); EMIT_ARG(label_assign, pop_label);
EMIT_ARG(for_iter_end, true); EMIT(for_iter_end);
// break/continue apply to outer loop (if any) in the else block // break/continue apply to outer loop (if any) in the else block
END_BREAK_CONTINUE_BLOCK END_BREAK_CONTINUE_BLOCK
@ -2906,7 +2906,7 @@ STATIC void compile_scope_comp_iter(compiler_t *comp, mp_parse_node_struct_t *pn
EMIT_ARG(jump, l_top); EMIT_ARG(jump, l_top);
EMIT_ARG(label_assign, l_end); EMIT_ARG(label_assign, l_end);
EMIT_ARG(for_iter_end, true); EMIT(for_iter_end);
} }
STATIC void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) { STATIC void check_for_doc_string(compiler_t *comp, mp_parse_node_t pn) {

4
py/emit.h
Wyświetl plik

@ -112,7 +112,7 @@ typedef struct _emit_method_table_t {
void (*end_finally)(emit_t *emit); void (*end_finally)(emit_t *emit);
void (*get_iter)(emit_t *emit, bool use_stack); void (*get_iter)(emit_t *emit, bool use_stack);
void (*for_iter)(emit_t *emit, mp_uint_t label); void (*for_iter)(emit_t *emit, mp_uint_t label);
void (*for_iter_end)(emit_t *emit, bool use_stack); void (*for_iter_end)(emit_t *emit);
void (*pop_block)(emit_t *emit); void (*pop_block)(emit_t *emit);
void (*pop_except)(emit_t *emit); void (*pop_except)(emit_t *emit);
void (*unary_op)(emit_t *emit, mp_unary_op_t op); void (*unary_op)(emit_t *emit, mp_unary_op_t op);
@ -230,7 +230,7 @@ void mp_emit_bc_setup_finally(emit_t *emit, mp_uint_t label);
void mp_emit_bc_end_finally(emit_t *emit); void mp_emit_bc_end_finally(emit_t *emit);
void mp_emit_bc_get_iter(emit_t *emit, bool use_stack); void mp_emit_bc_get_iter(emit_t *emit, bool use_stack);
void mp_emit_bc_for_iter(emit_t *emit, mp_uint_t label); void mp_emit_bc_for_iter(emit_t *emit, mp_uint_t label);
void mp_emit_bc_for_iter_end(emit_t *emit, bool use_stack); void mp_emit_bc_for_iter_end(emit_t *emit);
void mp_emit_bc_pop_block(emit_t *emit); void mp_emit_bc_pop_block(emit_t *emit);
void mp_emit_bc_pop_except(emit_t *emit); void mp_emit_bc_pop_except(emit_t *emit);
void mp_emit_bc_unary_op(emit_t *emit, mp_unary_op_t op); void mp_emit_bc_unary_op(emit_t *emit, mp_unary_op_t op);

4
py/emitbc.c
Wyświetl plik

@ -787,8 +787,8 @@ void mp_emit_bc_for_iter(emit_t *emit, mp_uint_t label) {
emit_write_bytecode_byte_unsigned_label(emit, MP_BC_FOR_ITER, label); emit_write_bytecode_byte_unsigned_label(emit, MP_BC_FOR_ITER, label);
} }
void mp_emit_bc_for_iter_end(emit_t *emit, bool use_stack) { void mp_emit_bc_for_iter_end(emit_t *emit) {
emit_bc_pre(emit, -(use_stack ? sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t) : 1)); emit_bc_pre(emit, -(sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t)));
} }
void mp_emit_bc_pop_block(emit_t *emit) { void mp_emit_bc_pop_block(emit_t *emit) {

4
py/emitnative.c
Wyświetl plik

@ -1827,10 +1827,10 @@ STATIC void emit_native_for_iter(emit_t *emit, mp_uint_t label) {
emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET); emit_post_push_reg(emit, VTYPE_PYOBJ, REG_RET);
} }
STATIC void emit_native_for_iter_end(emit_t *emit, bool use_stack) { STATIC void emit_native_for_iter_end(emit_t *emit) {
// adjust stack counter (we get here from for_iter ending, which popped the value for us) // adjust stack counter (we get here from for_iter ending, which popped the value for us)
emit_native_pre(emit); emit_native_pre(emit);
adjust_stack(emit, -(use_stack ? sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t) : 1)); adjust_stack(emit, -(sizeof(mp_obj_iter_buf_t) / sizeof(mp_obj_t)));
emit_post(emit); emit_post(emit);
} }