zig

commit 95a7f3553d21bd70fedf20adbf10d1edaa13a76c (tree)
parent b28b7f63d15ab0fdd9064c6c58e6339705edbc27
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Wed, 13 Jan 2016 18:17:52 -0700

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

Diffstat:
M
src/analyze.cpp
 | 
7
+++++--
M
src/codegen.cpp
 | 
2
+-

2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/analyze.cpp b/src/analyze.cpp
@@ -1408,7 +1408,7 @@ TypeTableEntry *find_container(BlockContext *context, Buf *name) {
 }
 
 static TypeEnumField *get_enum_field(TypeTableEntry *enum_type, Buf *name) {
-    for (int i = 0; i < enum_type->data.enumeration.field_count; i += 1) {
+    for (uint32_t i = 0; i < enum_type->data.enumeration.field_count; i += 1) {
         TypeEnumField *type_enum_field = &enum_type->data.enumeration.fields[i];
         if (buf_eql_buf(type_enum_field->name, name)) {
             return type_enum_field;
@@ -1418,7 +1418,7 @@ static TypeEnumField *get_enum_field(TypeTableEntry *enum_type, Buf *name) {
 }
 
 static TypeStructField *get_struct_field(TypeTableEntry *struct_type, Buf *name) {
-    for (int i = 0; i < struct_type->data.structure.field_count; i += 1) {
+    for (uint32_t i = 0; i < struct_type->data.structure.field_count; i += 1) {
         TypeStructField *type_struct_field = &struct_type->data.structure.fields[i];
         if (buf_eql_buf(type_struct_field->name, name)) {
             return type_struct_field;
@@ -3561,6 +3561,7 @@ Expr *get_resolved_expr(AstNode *node) {
         case NodeTypeStructValueField:
             zig_unreachable();
     }
+    zig_unreachable();
 }
 
 NumLitCodeGen *get_resolved_num_lit(AstNode *node) {
@@ -3607,6 +3608,7 @@ NumLitCodeGen *get_resolved_num_lit(AstNode *node) {
         case NodeTypeArrayType:
             zig_unreachable();
     }
+    zig_unreachable();
 }
 
 TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {
@@ -3654,6 +3656,7 @@ TopLevelDecl *get_resolved_top_level_decl(AstNode *node) {
         case NodeTypeArrayType:
             zig_unreachable();
     }
+    zig_unreachable();
 }
 
 bool is_node_void_expr(AstNode *node) {
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -2428,7 +2428,7 @@ static void define_builtin_fns_int(CodeGen *g, TypeTableEntry *type_entry) {
         {"sub", "ssub", "usub"},
         {"mul", "smul", "umul"},
     };
-    for (int i = 0; i < sizeof(overflow_fns)/sizeof(overflow_fns[0]); i += 1) {
+    for (size_t i = 0; i < sizeof(overflow_fns)/sizeof(overflow_fns[0]); i += 1) {
         OverflowFn *overflow_fn = &overflow_fns[i];
         BuiltinFnEntry *builtin_fn = allocate<BuiltinFnEntry>(1);
         buf_resize(&builtin_fn->name, 0);