Merge branch 'master' into zen_stdlib

1 files changed, 74 insertions, 10 deletions

diff --git a/test/cases/array.zig b/test/cases/array.zig
index 577161dd16..b72491bcc0 100644
--- a/test/cases/array.zig
+++ b/test/cases/array.zig
@@ -2,9 +2,9 @@ const assert = @import("std").debug.assert;
 const mem = @import("std").mem;
 
 test "arrays" {
-    var array : [5]u32 = undefined;
+    var array: [5]u32 = undefined;
 
-    var i : u32 = 0;
+    var i: u32 = 0;
     while (i < 5) {
         array[i] = i + 1;
         i = array[i];
@@ -34,24 +34,41 @@ test "void arrays" {
 }
 
 test "array literal" {
-    const hex_mult = []u16{4096, 256, 16, 1};
+    const hex_mult = []u16{
+        4096,
+        256,
+        16,
+        1,
+    };
 
     assert(hex_mult.len == 4);
     assert(hex_mult[1] == 256);
 }
 
 test "array dot len const expr" {
-    assert(comptime x: {break :x some_array.len == 4;});
+    assert(comptime x: {
+        break :x some_array.len == 4;
+    });
 }
 
 const ArrayDotLenConstExpr = struct {
     y: [some_array.len]u8,
 };
-const some_array = []u8 {0, 1, 2, 3};
-
+const some_array = []u8{
+    0,
+    1,
+    2,
+    3,
+};
 
 test "nested arrays" {
-    const array_of_strings = [][]const u8 {"hello", "this", "is", "my", "thing"};
+    const array_of_strings = [][]const u8{
+        "hello",
+        "this",
+        "is",
+        "my",
+        "thing",
+    };
     for (array_of_strings) |s, i| {
         if (i == 0) assert(mem.eql(u8, s, "hello"));
         if (i == 1) assert(mem.eql(u8, s, "this"));
@@ -61,7 +78,6 @@ test "nested arrays" {
     }
 }
 
-
 var s_array: [8]Sub = undefined;
 const Sub = struct {
     b: u8,
@@ -70,7 +86,7 @@ const Str = struct {
     a: []Sub,
 };
 test "set global var array via slice embedded in struct" {
-    var s = Str { .a = s_array[0..]};
+    var s = Str{ .a = s_array[0..] };
 
     s.a[0].b = 1;
     s.a[1].b = 2;
@@ -82,7 +98,10 @@ test "set global var array via slice embedded in struct" {
 }
 
 test "array literal with specified size" {
-    var array = [2]u8{1, 2};
+    var array = [2]u8{
+        1,
+        2,
+    };
     assert(array[0] == 1);
     assert(array[1] == 2);
 }
@@ -96,3 +115,48 @@ test "array len property" {
     var x: [5]i32 = undefined;
     assert(@typeOf(x).len == 5);
 }
+
+test "array len field" {
+    var arr = [4]u8{ 0, 0, 0, 0 };
+    var ptr = &arr;
+    assert(arr.len == 4);
+    comptime assert(arr.len == 4);
+    assert(ptr.len == 4);
+    comptime assert(ptr.len == 4);
+}
+
+test "single-item pointer to array indexing and slicing" {
+    testSingleItemPtrArrayIndexSlice();
+    comptime testSingleItemPtrArrayIndexSlice();
+}
+
+fn testSingleItemPtrArrayIndexSlice() void {
+    var array = "aaaa";
+    doSomeMangling(&array);
+    assert(mem.eql(u8, "azya", array));
+}
+
+fn doSomeMangling(array: *[4]u8) void {
+    array[1] = 'z';
+    array[2..3][0] = 'y';
+}
+
+test "implicit cast single-item pointer" {
+    testImplicitCastSingleItemPtr();
+    comptime testImplicitCastSingleItemPtr();
+}
+
+fn testImplicitCastSingleItemPtr() void {
+    var byte: u8 = 100;
+    const slice = (*[1]u8)(&byte)[0..];
+    slice[0] += 1;
+    assert(byte == 101);
+}
+
+fn testArrayByValAtComptime(b: [2]u8) u8 { return b[0]; }
+
+test "comptime evalutating function that takes array by value" {
+    const arr = []u8{0,1};
+    _ = comptime testArrayByValAtComptime(arr);
+    _ = comptime testArrayByValAtComptime(arr);
+}