From 7e12a601b8e9d90e5a7498523a9023c8c47bc4ca Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 8 Oct 2015 13:02:00 +0100 Subject: py/compile: Fix edge case when constant-folding negation of integer. Also adds tests specifically for testing constant folding. --- py/compile.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'py/compile.c') diff --git a/py/compile.c b/py/compile.c index f9d53bc689..9d2a6f2af8 100644 --- a/py/compile.c +++ b/py/compile.c @@ -315,7 +315,10 @@ STATIC mp_parse_node_t fold_constants(compiler_t *comp, mp_parse_node_t pn, mp_m pn = mp_parse_node_new_leaf(MP_PARSE_NODE_SMALL_INT, arg); } else if (MP_PARSE_NODE_IS_TOKEN_KIND(pns->nodes[0], MP_TOKEN_OP_MINUS)) { // -int - pn = mp_parse_node_new_leaf(MP_PARSE_NODE_SMALL_INT, -arg); + arg = -arg; + if (MP_SMALL_INT_FITS(arg)) { + pn = mp_parse_node_new_leaf(MP_PARSE_NODE_SMALL_INT, arg); + } } else { assert(MP_PARSE_NODE_IS_TOKEN_KIND(pns->nodes[0], MP_TOKEN_OP_TILDE)); // should be // ~int -- cgit v1.2.3