authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-05-15 01:25:07-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-05-15 01:30:25-07:00
log9813ae8586b2c33ebcb7f3f522665675b2901701
tree5e3ce20c4c622f2780f22606e50cb686cb62e26f
parent6ff996f60fa4e26e8dc5a8556986b5caa3eb1021

add bit_count, is_wrapping, is_signed fields to int types

2 files changed, 65 insertions(+), 13 deletions(-)

src/analyze.cpp+37-13
......@@ -35,7 +35,9 @@ static TypeTableEntry *resolve_expr_const_val_as_fn(CodeGen *g, AstNode *node, F
3535static TypeTableEntry *resolve_expr_const_val_as_type(CodeGen *g, AstNode *node, TypeTableEntry *type,
3636 bool depends_on_compile_var);
3737static TypeTableEntry *resolve_expr_const_val_as_unsigned_num_lit(CodeGen *g, AstNode *node,
38 TypeTableEntry *expected_type, uint64_t x);
38 TypeTableEntry *expected_type, uint64_t x, bool depends_on_compile_var);
39static TypeTableEntry *resolve_expr_const_val_as_bool(CodeGen *g, AstNode *node, bool value,
40 bool depends_on_compile_var);
3941static AstNode *find_decl(BlockContext *context, Buf *name);
4042static TypeTableEntry *analyze_decl_ref(CodeGen *g, AstNode *source_node, AstNode *decl_node,
4143 bool pointer_only, BlockContext *block_context, bool depends_on_compile_var);
......@@ -2562,7 +2564,9 @@ static TypeTableEntry *analyze_field_access_expr(CodeGen *g, ImportTableEntry *i
25622564
25632565 bool wrapped_in_fn_call = node->data.field_access_expr.is_fn_call;
25642566
2565 if (struct_type->id == TypeTableEntryIdStruct || (struct_type->id == TypeTableEntryIdPointer &&
2567 if (struct_type->id == TypeTableEntryIdInvalid) {
2568 return struct_type;
2569 } else if (struct_type->id == TypeTableEntryIdStruct || (struct_type->id == TypeTableEntryIdPointer &&
25662570 struct_type->data.pointer.child_type->id == TypeTableEntryIdStruct))
25672571 {
25682572 TypeTableEntry *bare_struct_type = (struct_type->id == TypeTableEntryIdStruct) ?
......@@ -2603,7 +2607,7 @@ static TypeTableEntry *analyze_field_access_expr(CodeGen *g, ImportTableEntry *i
26032607 } else if (struct_type->id == TypeTableEntryIdArray) {
26042608 if (buf_eql_str(field_name, "len")) {
26052609 return resolve_expr_const_val_as_unsigned_num_lit(g, node, expected_type,
2606 struct_type->data.array.len);
2610 struct_type->data.array.len, false);
26072611 } else {
26082612 add_node_error(g, node,
26092613 buf_sprintf("no member named '%s' in '%s'", buf_ptr(field_name),
......@@ -2653,6 +2657,24 @@ static TypeTableEntry *analyze_field_access_expr(CodeGen *g, ImportTableEntry *i
26532657 }
26542658 } else if (child_type->id == TypeTableEntryIdPureError) {
26552659 return analyze_error_literal_expr(g, import, context, node, field_name);
2660 } else if (child_type->id == TypeTableEntryIdInt) {
2661 bool depends_on_compile_var =
2662 get_resolved_expr(*struct_expr_node)->const_val.depends_on_compile_var;
2663 if (buf_eql_str(field_name, "bit_count")) {
2664 return resolve_expr_const_val_as_unsigned_num_lit(g, node, expected_type,
2665 child_type->data.integral.bit_count, depends_on_compile_var);
2666 } else if (buf_eql_str(field_name, "is_signed")) {
2667 return resolve_expr_const_val_as_bool(g, node, child_type->data.integral.is_signed,
2668 depends_on_compile_var);
2669 } else if (buf_eql_str(field_name, "is_wrapping")) {
2670 return resolve_expr_const_val_as_bool(g, node, child_type->data.integral.is_wrapping,
2671 depends_on_compile_var);
2672 } else {
2673 add_node_error(g, node,
2674 buf_sprintf("type '%s' has no member called '%s'",
2675 buf_ptr(&child_type->name), buf_ptr(field_name)));
2676 return g->builtin_types.entry_invalid;
2677 }
26562678 } else if (wrapped_in_fn_call) { // this branch should go last, before the error in the else case
26572679 return resolve_expr_const_val_as_type(g, node, child_type, false);
26582680 } else {
......@@ -2682,10 +2704,8 @@ static TypeTableEntry *analyze_field_access_expr(CodeGen *g, ImportTableEntry *i
26822704 return g->builtin_types.entry_invalid;
26832705 }
26842706 } else {
2685 if (struct_type->id != TypeTableEntryIdInvalid) {
2686 add_node_error(g, node,
2687 buf_sprintf("type '%s' does not support field access", buf_ptr(&struct_type->name)));
2688 }
2707 add_node_error(g, node,
2708 buf_sprintf("type '%s' does not support field access", buf_ptr(&struct_type->name)));
26892709 return g->builtin_types.entry_invalid;
26902710 }
26912711}
......@@ -2891,10 +2911,11 @@ static TypeTableEntry *resolve_expr_const_val_as_string_lit(CodeGen *g, AstNode
28912911
28922912
28932913static TypeTableEntry *resolve_expr_const_val_as_unsigned_num_lit(CodeGen *g, AstNode *node,
2894 TypeTableEntry *expected_type, uint64_t x)
2914 TypeTableEntry *expected_type, uint64_t x, bool depends_on_compile_var)
28952915{
28962916 Expr *expr = get_resolved_expr(node);
28972917 expr->const_val.ok = true;
2918 expr->const_val.depends_on_compile_var = depends_on_compile_var;
28982919
28992920 bignum_init_unsigned(&expr->const_val.data.x_bignum, x);
29002921
......@@ -3797,7 +3818,7 @@ static TypeTableEntry *analyze_number_literal_expr(CodeGen *g, ImportTableEntry
37973818
37983819 if (node->data.number_literal.kind == NumLitUInt) {
37993820 return resolve_expr_const_val_as_unsigned_num_lit(g, node,
3800 expected_type, node->data.number_literal.data.x_uint);
3821 expected_type, node->data.number_literal.data.x_uint, false);
38013822 } else if (node->data.number_literal.kind == NumLitFloat) {
38023823 return resolve_expr_const_val_as_float_num_lit(g, node,
38033824 expected_type, node->data.number_literal.data.x_float);
......@@ -4964,7 +4985,8 @@ static TypeTableEntry *analyze_builtin_fn_call_expr(CodeGen *g, ImportTableEntry
49644985 return g->builtin_types.entry_invalid;
49654986 } else {
49664987 uint64_t size_in_bytes = type_size(g, type_entry);
4967 return resolve_expr_const_val_as_unsigned_num_lit(g, node, expected_type, size_in_bytes);
4988 return resolve_expr_const_val_as_unsigned_num_lit(g, node, expected_type,
4989 size_in_bytes, false);
49684990 }
49694991 }
49704992 case BuiltinFnIdAlignof:
......@@ -4979,7 +5001,8 @@ static TypeTableEntry *analyze_builtin_fn_call_expr(CodeGen *g, ImportTableEntry
49795001 return g->builtin_types.entry_invalid;
49805002 } else {
49815003 uint64_t align_in_bytes = LLVMABISizeOfType(g->target_data_ref, type_entry->type_ref);
4982 return resolve_expr_const_val_as_unsigned_num_lit(g, node, expected_type, align_in_bytes);
5004 return resolve_expr_const_val_as_unsigned_num_lit(g, node, expected_type,
5005 align_in_bytes, false);
49835006 }
49845007 }
49855008 case BuiltinFnIdMaxValue:
......@@ -4997,7 +5020,8 @@ static TypeTableEntry *analyze_builtin_fn_call_expr(CodeGen *g, ImportTableEntry
49975020 return type_entry;
49985021 } else if (type_entry->id == TypeTableEntryIdEnum) {
49995022 uint64_t value_count = type_entry->data.enumeration.field_count;
5000 return resolve_expr_const_val_as_unsigned_num_lit(g, node, expected_type, value_count);
5023 return resolve_expr_const_val_as_unsigned_num_lit(g, node, expected_type,
5024 value_count, false);
50015025 } else {
50025026 add_node_error(g, node,
50035027 buf_sprintf("no value count available for type '%s'", buf_ptr(&type_entry->name)));
......@@ -6188,7 +6212,7 @@ static TypeTableEntry *analyze_expression_pointer_only(CodeGen *g, ImportTableEn
61886212 break;
61896213 case NodeTypeCharLiteral:
61906214 return_type = resolve_expr_const_val_as_unsigned_num_lit(g, node, expected_type,
6191 node->data.char_literal.value);
6215 node->data.char_literal.value, false);
61926216 break;
61936217 case NodeTypeBoolLiteral:
61946218 return_type = resolve_expr_const_val_as_bool(g, node, node->data.bool_literal.value, false);
test/self_hosted.zig+28
......@@ -1711,4 +1711,32 @@ fn int_type_builtin() {
17111711 assert(@int_type(false, 16, true) == u16w);
17121712 assert(@int_type(false, 32, true) == u32w);
17131713 assert(@int_type(false, 64, true) == u64w);
1714
1715 assert(i8.bit_count == 8);
1716 assert(i16.bit_count == 16);
1717 assert(i32.bit_count == 32);
1718 assert(i64.bit_count == 64);
1719
1720 assert(!i8.is_wrapping);
1721 assert(!i16.is_wrapping);
1722 assert(!i32.is_wrapping);
1723 assert(!i64.is_wrapping);
1724
1725 assert(i8w.is_wrapping);
1726 assert(i16w.is_wrapping);
1727 assert(i32w.is_wrapping);
1728 assert(i64w.is_wrapping);
1729
1730 assert(i8.is_signed);
1731 assert(i16.is_signed);
1732 assert(i32.is_signed);
1733 assert(i64.is_signed);
1734 assert(isize.is_signed);
1735
1736 assert(!u8.is_signed);
1737 assert(!u16.is_signed);
1738 assert(!u32.is_signed);
1739 assert(!u64.is_signed);
1740 assert(!usize.is_signed);
1741
17141742}