From d556fa2cd8570363a66a7d8a2a5abf5ba306e954 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Sun, 3 Jun 2018 15:06:40 +0100 Subject: Remove special shared scope for runtime stuff --- src/check_expr.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/check_expr.cpp') diff --git a/src/check_expr.cpp b/src/check_expr.cpp index 2ae7a3fa1..b2363be38 100644 --- a/src/check_expr.cpp +++ b/src/check_expr.cpp @@ -4125,7 +4125,6 @@ void check_unpack_arguments(CheckerContext *ctx, Entity **lhs, isize lhs_count, o.mode = Addressing_Invalid; } - if (o.type == nullptr || o.type->kind != Type_Tuple) { if (allow_ok && lhs_count == 2 && rhs.count == 1 && (o.mode == Addressing_MapIndex || o.mode == Addressing_OptionalOk)) { @@ -5913,7 +5912,7 @@ ExprKind check_expr_base_internal(CheckerContext *c, Operand *o, AstNode *node, return kind; } - add_package_dependency(c, "runtime", "__type_assertion_check"); + add_package_dependency(c, "runtime", "type_assertion_check"); case_end; case_ast_node(tc, TypeCast, node); @@ -6218,8 +6217,8 @@ ExprKind check_expr_base(CheckerContext *c, Operand *o, AstNode *node, Type *typ type = nullptr; break; case Addressing_Constant: - type = o->type; value = o->value; + type = o->type; break; default: type = o->type; -- cgit v1.2.3