authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-12 21:07:45-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-12 21:07:45-07:00
log76dc44d2a69293b08d4369dedf5d735e3dc29803
tree74a817bf72b6596ffe195f6f4e1835d1648048e9
parentcb46d0b5b0d1d83856adab34b461049f5cfac019

fix build with gcc

closes #66

2 files changed, 7 insertions(+), 4 deletions(-)

src/analyze.cpp+6-3
...@@ -1503,7 +1503,7 @@ TypeTableEntry *find_container(BlockContext *context, Buf *name) {...@@ -1503,7 +1503,7 @@ TypeTableEntry *find_container(BlockContext *context, Buf *name) {
1503}1503}
15041504
1505static TypeEnumField *get_enum_field(TypeTableEntry *enum_type, Buf *name) {1505static TypeEnumField *get_enum_field(TypeTableEntry *enum_type, Buf *name) {
1506 for (int i = 0; i < enum_type->data.enumeration.field_count; i += 1) {1506 for (uint32_t i = 0; i < enum_type->data.enumeration.field_count; i += 1) {
1507 TypeEnumField *type_enum_field = &enum_type->data.enumeration.fields[i];1507 TypeEnumField *type_enum_field = &enum_type->data.enumeration.fields[i];
1508 if (buf_eql_buf(type_enum_field->name, name)) {1508 if (buf_eql_buf(type_enum_field->name, name)) {
1509 return type_enum_field;1509 return type_enum_field;
...@@ -1513,7 +1513,7 @@ static TypeEnumField *get_enum_field(TypeTableEntry *enum_type, Buf *name) {...@@ -1513,7 +1513,7 @@ static TypeEnumField *get_enum_field(TypeTableEntry *enum_type, Buf *name) {
1513}1513}
15141514
1515static TypeStructField *get_struct_field(TypeTableEntry *struct_type, Buf *name) {1515static TypeStructField *get_struct_field(TypeTableEntry *struct_type, Buf *name) {
1516 for (int i = 0; i < struct_type->data.structure.field_count; i += 1) {1516 for (uint32_t i = 0; i < struct_type->data.structure.field_count; i += 1) {
1517 TypeStructField *type_struct_field = &struct_type->data.structure.fields[i];1517 TypeStructField *type_struct_field = &struct_type->data.structure.fields[i];
1518 if (buf_eql_buf(type_struct_field->name, name)) {1518 if (buf_eql_buf(type_struct_field->name, name)) {
1519 return type_struct_field;1519 return type_struct_field;
...@@ -2111,7 +2111,7 @@ static TypeTableEntry *analyze_number_literal_expr(CodeGen *g, ImportTableEntry...@@ -2111,7 +2111,7 @@ static TypeTableEntry *analyze_number_literal_expr(CodeGen *g, ImportTableEntry
21112111
2112static TypeStructField *find_struct_type_field(TypeTableEntry *type_entry, Buf *name, int *index) {2112static TypeStructField *find_struct_type_field(TypeTableEntry *type_entry, Buf *name, int *index) {
2113 assert(type_entry->id == TypeTableEntryIdStruct);2113 assert(type_entry->id == TypeTableEntryIdStruct);
2114 for (int i = 0; i < type_entry->data.structure.field_count; i += 1) {2114 for (uint32_t i = 0; i < type_entry->data.structure.field_count; i += 1) {
2115 TypeStructField *field = &type_entry->data.structure.fields[i];2115 TypeStructField *field = &type_entry->data.structure.fields[i];
2116 if (buf_eql_buf(field->name, name)) {2116 if (buf_eql_buf(field->name, name)) {
2117 *index = i;2117 *index = i;
...@@ -3575,6 +3575,7 @@ Expr *get_resolved_expr(AstNode *node) {...@@ -3575,6 +3575,7 @@ Expr *get_resolved_expr(AstNode *node) {
3575 case NodeTypeStructValueField:3575 case NodeTypeStructValueField:
3576 zig_unreachable();3576 zig_unreachable();
3577 }3577 }
3578 zig_unreachable();
3578}3579}
35793580
3580NumLitCodeGen *get_resolved_num_lit(AstNode *node) {3581NumLitCodeGen *get_resolved_num_lit(AstNode *node) {
...@@ -3625,6 +3626,7 @@ NumLitCodeGen *get_resolved_num_lit(AstNode *node) {...@@ -3625,6 +3626,7 @@ NumLitCodeGen *get_resolved_num_lit(AstNode *node) {
3625 case NodeTypeCompilerFnExpr:3626 case NodeTypeCompilerFnExpr:
3626 zig_unreachable();3627 zig_unreachable();
3627 }3628 }
3629 zig_unreachable();
3628}3630}
36293631
3630TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {3632TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {
...@@ -3676,4 +3678,5 @@ TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {...@@ -3676,4 +3678,5 @@ TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {
3676 case NodeTypeCompilerFnType:3678 case NodeTypeCompilerFnType:
3677 zig_unreachable();3679 zig_unreachable();
3678 }3680 }
3681 zig_unreachable();
3679}3682}
src/codegen.cpp+1-1
...@@ -2402,7 +2402,7 @@ static void define_builtin_fns_int(CodeGen *g, TypeTableEntry *type_entry) {...@@ -2402,7 +2402,7 @@ static void define_builtin_fns_int(CodeGen *g, TypeTableEntry *type_entry) {
2402 {"sub", "ssub", "usub"},2402 {"sub", "ssub", "usub"},
2403 {"mul", "smul", "umul"},2403 {"mul", "smul", "umul"},
2404 };2404 };
2405 for (int i = 0; i < sizeof(overflow_fns)/sizeof(overflow_fns[0]); i += 1) {2405 for (size_t i = 0; i < sizeof(overflow_fns)/sizeof(overflow_fns[0]); i += 1) {
2406 OverflowFn *overflow_fn = &overflow_fns[i];2406 OverflowFn *overflow_fn = &overflow_fns[i];
2407 BuiltinFnEntry *builtin_fn = allocate<BuiltinFnEntry>(1);2407 BuiltinFnEntry *builtin_fn = allocate<BuiltinFnEntry>(1);
2408 buf_resize(&builtin_fn->name, 0);2408 buf_resize(&builtin_fn->name, 0);