From 85ac95f81be8632c3fa3584f67714337181003de Mon Sep 17 00:00:00 2001 From: gingerBill Date: Thu, 16 Aug 2018 00:07:26 +0100 Subject: [PATCH] Constant evaluation for `in` expression for `bit_set`s --- examples/demo/demo.odin | 4 +++- src/check_expr.cpp | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/examples/demo/demo.odin b/examples/demo/demo.odin index acedd253b..8e95aefc4 100644 --- a/examples/demo/demo.odin +++ b/examples/demo/demo.odin @@ -727,7 +727,7 @@ bit_set_type :: proc() { WEEKEND :: Days{Sunday, Saturday}; d: Days; - d = Days{Sunday} | Days{Monday}; + d = {Sunday, Monday}; x := Tuesday; e := d | WEEKEND; e |= {Monday}; @@ -738,6 +738,8 @@ bit_set_type :: proc() { if Saturday in e { fmt.println("Saturday in", e); } + X :: Saturday in WEEKEND; // Constant evaluation + fmt.println(X); } main :: proc() { diff --git a/src/check_expr.cpp b/src/check_expr.cpp index 958bd6a77..1bcac33ae 100644 --- a/src/check_expr.cpp +++ b/src/check_expr.cpp @@ -2041,6 +2041,22 @@ void check_binary_expr(CheckerContext *c, Operand *x, Ast *node, bool use_lhs_as } else if (is_type_bit_set(y->type)) { Type *yt = base_type(y->type); check_assignment(c, x, yt->BitSet.base, str_lit("bit_set 'in'")); + + if (x->mode == Addressing_Constant && y->mode == Addressing_Constant) { + ExactValue k = exact_value_to_integer(x->value); + ExactValue v = exact_value_to_integer(y->value); + GB_ASSERT(k.kind == ExactValue_Integer); + GB_ASSERT(v.kind == ExactValue_Integer); + i64 bit = 1ll<mode = Addressing_Constant; + x->type = t_untyped_bool; + x->value = exact_value_bool((bit & bits) != 0); + x->expr = node; + return; + } + } else { gbString t = type_to_string(y->type); error(x->expr, "expected either a map or bitset for 'in', got %s", t);