From bc81ddfea67db0b3756027e98cc00bb8fa903a20 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Tue, 26 Jul 2016 20:40:11 -0700
Subject: unsigned integers for sizes of things

Closes #62.
---
 test/run_tests.cpp   | 14 +++++++-------
 test/self_hosted.zig | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'test')

diff --git a/test/run_tests.cpp b/test/run_tests.cpp
index 096c76809f..7d5948628e 100644
--- a/test/run_tests.cpp
+++ b/test/run_tests.cpp
@@ -466,7 +466,7 @@ pub fn main(args: [][]u8) -> %void {
         %%io.stdout.printf("\n");
     }
     for (array) |item, index| {
-        %%io.stdout.print_i64(index);
+        %%io.stdout.print_u64(index);
         %%io.stdout.printf("\n");
     }
     const unknown_size: []u8 = array;
@@ -475,7 +475,7 @@ pub fn main(args: [][]u8) -> %void {
         %%io.stdout.printf("\n");
     }
     for (unknown_size) |item, index| {
-        %%io.stdout.print_i64(index);
+        %%io.stdout.print_u64(index);
         %%io.stdout.printf("\n");
     }
 }
@@ -497,7 +497,7 @@ export fn compare_fn(a: ?&const c_void, b: ?&const c_void) -> c_int {
 }
 
 export fn main(args: c_int, argv: &&u8) -> c_int {
-    var array = []i32 { 1, 7, 3, 2, 0, 9, 4, 8, 6, 5 };
+    var array = []u32 { 1, 7, 3, 2, 0, 9, 4, 8, 6, 5 };
 
     c.qsort((&c_void)(&array[0]), c_ulong(array.len), @sizeof(i32), compare_fn);
 
@@ -816,7 +816,7 @@ fn f() {
     )SOURCE", 4, ".tmp_source.zig:4:5: error: use of undeclared identifier 'i'",
                  ".tmp_source.zig:4:7: error: use of undeclared identifier 'i'",
                  ".tmp_source.zig:5:8: error: array access of non-array",
-                 ".tmp_source.zig:5:9: error: expected type 'isize', got 'bool'");
+                 ".tmp_source.zig:5:9: error: expected type 'usize', got 'bool'");
 
     add_compile_fail_case("variadic functions only allowed in extern", R"SOURCE(
 fn f(...) {}
@@ -1115,8 +1115,8 @@ fn a(x: i32) {
 struct Foo {
     y: [get()]u8,
 }
-var global_var: isize = 1;
-fn get() -> isize { global_var }
+var global_var: usize = 1;
+fn get() -> usize { global_var }
     )SOURCE", 1, ".tmp_source.zig:3:9: error: unable to evaluate constant expression");
 
 
@@ -1397,7 +1397,7 @@ pub fn main(args: [][]u8) { }
 
 
     add_compile_fail_case("invalid pointer for var type", R"SOURCE(
-extern fn ext() -> isize;
+extern fn ext() -> usize;
 var bytes: [ext()]u8 = undefined;
 fn f() {
     for (bytes) |*b, i| {
diff --git a/test/self_hosted.zig b/test/self_hosted.zig
index 85eeb8bab2..faeb3cdceb 100644
--- a/test/self_hosted.zig
+++ b/test/self_hosted.zig
@@ -96,16 +96,16 @@ fn mutable_local_variables() {
 
 #attribute("test")
 fn arrays() {
-    var array : [5]i32 = undefined;
+    var array : [5]u32 = undefined;
 
-    var i : i32 = 0;
+    var i : u32 = 0;
     while (i < 5) {
         array[i] = i + 1;
         i = array[i];
     }
 
     i = 0;
-    var accumulator = i32(0);
+    var accumulator = u32(0);
     while (i < 5) {
         accumulator += array[i];
 
@@ -115,7 +115,7 @@ fn arrays() {
     assert(accumulator == 15);
     assert(get_array_len(array) == 5);
 }
-fn get_array_len(a: []i32) -> isize {
+fn get_array_len(a: []u32) -> usize {
     a.len
 }
 
@@ -742,7 +742,7 @@ fn generic_malloc_free() {
 }
 const some_mem : [100]u8 = undefined;
 #static_eval_enable(false)
-fn mem_alloc(inline T: type, n: isize) -> %[]T {
+fn mem_alloc(inline T: type, n: usize) -> %[]T {
     return (&T)(&some_mem[0])[0...n];
 }
 fn mem_free(inline T: type, mem: []T) { }
@@ -823,10 +823,10 @@ fn test_cast_undefined(x: []u8) {}
 #attribute("test")
 fn cast_small_unsigned_to_larger_signed() {
     assert(cast_small_unsigned_to_larger_signed_1(200) == i16(200));
-    assert(cast_small_unsigned_to_larger_signed_2(9999) == isize(9999));
+    assert(cast_small_unsigned_to_larger_signed_2(9999) == i64(9999));
 }
 fn cast_small_unsigned_to_larger_signed_1(x: u8) -> i16 { x }
-fn cast_small_unsigned_to_larger_signed_2(x: u16) -> isize { x }
+fn cast_small_unsigned_to_larger_signed_2(x: u16) -> i64 { x }
 
 
 #attribute("test")
@@ -834,7 +834,7 @@ fn implicit_cast_after_unreachable() {
     assert(outer() == 1234);
 }
 fn inner() -> i32 { 1234 }
-fn outer() -> isize {
+fn outer() -> i64 {
     return inner();
 }
 
@@ -1029,7 +1029,7 @@ fn constant_expressions() {
     var array : [ARRAY_SIZE]u8 = undefined;
     assert(@sizeof(@typeof(array)) == 20);
 }
-const ARRAY_SIZE : i8 = 20;
+const ARRAY_SIZE : u8 = 20;
 
 
 #attribute("test")
@@ -1315,7 +1315,7 @@ fn test_return_empty_struct_from_fn_noeval() -> EmptyStruct2 {
 fn pass_slice_of_empty_struct_to_fn() {
     assert(test_pass_slice_of_empty_struct_to_fn([]EmptyStruct2{ EmptyStruct2{} }) == 1);
 }
-fn test_pass_slice_of_empty_struct_to_fn(slice: []EmptyStruct2) -> isize {
+fn test_pass_slice_of_empty_struct_to_fn(slice: []EmptyStruct2) -> usize {
     slice.len
 }
 
@@ -1555,7 +1555,7 @@ fn c_string_concatenation() {
 
     const len = cstr.len(b);
     const len_with_null = len + 1;
-    {var i: i32 = 0; while (i < len_with_null; i += 1) {
+    {var i: u32 = 0; while (i < len_with_null; i += 1) {
         assert(a[i] == b[i]);
     }}
     assert(a[len] == 0);
-- 
cgit v1.2.3