From 6ce7c051e853e631802aedd39cbffb14dc3f123c Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 25 Jul 2019 12:10:45 +1000 Subject: py/lexer: Reorder operator tokens to match corresponding binary ops. --- py/parse.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'py/parse.c') diff --git a/py/parse.c b/py/parse.c index 66110e7c3d..946a3b1b34 100644 --- a/py/parse.c +++ b/py/parse.c @@ -645,19 +645,17 @@ STATIC bool fold_constants(parser_t *parser, uint8_t rule_id, size_t num_args) { } mp_token_kind_t tok = MP_PARSE_NODE_LEAF_ARG(peek_result(parser, i)); static const uint8_t token_to_op[] = { + MP_BINARY_OP_LSHIFT, + MP_BINARY_OP_RSHIFT, MP_BINARY_OP_ADD, MP_BINARY_OP_SUBTRACT, MP_BINARY_OP_MULTIPLY, - 255,//MP_BINARY_OP_POWER, - 255,//MP_BINARY_OP_TRUE_DIVIDE, MP_BINARY_OP_FLOOR_DIVIDE, + 255,//MP_BINARY_OP_TRUE_DIVIDE, MP_BINARY_OP_MODULO, - 255,//MP_BINARY_OP_LESS - MP_BINARY_OP_LSHIFT, - 255,//MP_BINARY_OP_MORE - MP_BINARY_OP_RSHIFT, + 255,//MP_BINARY_OP_POWER, }; - mp_binary_op_t op = token_to_op[tok - MP_TOKEN_OP_PLUS]; + mp_binary_op_t op = token_to_op[tok - MP_TOKEN_OP_DBL_LESS]; if (op == (mp_binary_op_t)255) { return false; } -- cgit v1.2.3