authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-13 18:17:52-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-13 18:17:52-07:00
log95a7f3553d21bd70fedf20adbf10d1edaa13a76c
tree5016fdeb4d62b08fc6a7adb3ebd6443a7dbbd2f6
parentb28b7f63d15ab0fdd9064c6c58e6339705edbc27
parent76dc44d2a69293b08d4369dedf5d735e3dc29803

Merge branch 'master' of github.com:andrewrk/zig

2 files changed, 6 insertions(+), 3 deletions(-)

src/analyze.cpp+5-2
...@@ -1408,7 +1408,7 @@ TypeTableEntry *find_container(BlockContext *context, Buf *name) {...@@ -1408,7 +1408,7 @@ TypeTableEntry *find_container(BlockContext *context, Buf *name) {
1408}1408}
14091409
1410static TypeEnumField *get_enum_field(TypeTableEntry *enum_type, Buf *name) {1410static TypeEnumField *get_enum_field(TypeTableEntry *enum_type, Buf *name) {
1411 for (int i = 0; i < enum_type->data.enumeration.field_count; i += 1) {1411 for (uint32_t i = 0; i < enum_type->data.enumeration.field_count; i += 1) {
1412 TypeEnumField *type_enum_field = &enum_type->data.enumeration.fields[i];1412 TypeEnumField *type_enum_field = &enum_type->data.enumeration.fields[i];
1413 if (buf_eql_buf(type_enum_field->name, name)) {1413 if (buf_eql_buf(type_enum_field->name, name)) {
1414 return type_enum_field;1414 return type_enum_field;
...@@ -1418,7 +1418,7 @@ static TypeEnumField *get_enum_field(TypeTableEntry *enum_type, Buf *name) {...@@ -1418,7 +1418,7 @@ static TypeEnumField *get_enum_field(TypeTableEntry *enum_type, Buf *name) {
1418}1418}
14191419
1420static TypeStructField *get_struct_field(TypeTableEntry *struct_type, Buf *name) {1420static TypeStructField *get_struct_field(TypeTableEntry *struct_type, Buf *name) {
1421 for (int i = 0; i < struct_type->data.structure.field_count; i += 1) {1421 for (uint32_t i = 0; i < struct_type->data.structure.field_count; i += 1) {
1422 TypeStructField *type_struct_field = &struct_type->data.structure.fields[i];1422 TypeStructField *type_struct_field = &struct_type->data.structure.fields[i];
1423 if (buf_eql_buf(type_struct_field->name, name)) {1423 if (buf_eql_buf(type_struct_field->name, name)) {
1424 return type_struct_field;1424 return type_struct_field;
...@@ -3561,6 +3561,7 @@ Expr *get_resolved_expr(AstNode *node) {...@@ -3561,6 +3561,7 @@ Expr *get_resolved_expr(AstNode *node) {
3561 case NodeTypeStructValueField:3561 case NodeTypeStructValueField:
3562 zig_unreachable();3562 zig_unreachable();
3563 }3563 }
3564 zig_unreachable();
3564}3565}
35653566
3566NumLitCodeGen *get_resolved_num_lit(AstNode *node) {3567NumLitCodeGen *get_resolved_num_lit(AstNode *node) {
...@@ -3607,6 +3608,7 @@ NumLitCodeGen *get_resolved_num_lit(AstNode *node) {...@@ -3607,6 +3608,7 @@ NumLitCodeGen *get_resolved_num_lit(AstNode *node) {
3607 case NodeTypeArrayType:3608 case NodeTypeArrayType:
3608 zig_unreachable();3609 zig_unreachable();
3609 }3610 }
3611 zig_unreachable();
3610}3612}
36113613
3612TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {3614TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {
...@@ -3654,6 +3656,7 @@ TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {...@@ -3654,6 +3656,7 @@ TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {
3654 case NodeTypeArrayType:3656 case NodeTypeArrayType:
3655 zig_unreachable();3657 zig_unreachable();
3656 }3658 }
3659 zig_unreachable();
3657}3660}
36583661
3659bool is_node_void_expr(AstNode *node) {3662bool is_node_void_expr(AstNode *node) {
src/codegen.cpp+1-1
...@@ -2428,7 +2428,7 @@ static void define_builtin_fns_int(CodeGen *g, TypeTableEntry *type_entry) {...@@ -2428,7 +2428,7 @@ static void define_builtin_fns_int(CodeGen *g, TypeTableEntry *type_entry) {
2428 {"sub", "ssub", "usub"},2428 {"sub", "ssub", "usub"},
2429 {"mul", "smul", "umul"},2429 {"mul", "smul", "umul"},
2430 };2430 };
2431 for (int i = 0; i < sizeof(overflow_fns)/sizeof(overflow_fns[0]); i += 1) {2431 for (size_t i = 0; i < sizeof(overflow_fns)/sizeof(overflow_fns[0]); i += 1) {
2432 OverflowFn *overflow_fn = &overflow_fns[i];2432 OverflowFn *overflow_fn = &overflow_fns[i];
2433 BuiltinFnEntry *builtin_fn = allocate<BuiltinFnEntry>(1);2433 BuiltinFnEntry *builtin_fn = allocate<BuiltinFnEntry>(1);
2434 buf_resize(&builtin_fn->name, 0);2434 buf_resize(&builtin_fn->name, 0);