zig

commit 45d9d9f953df2167b35878ea02551d9c86ad8a0f (tree)
parent e2a9f2ef988e6ff4ec9f943ead9285c67c56ffd7
Author: Andrew Kelley <superjoe30@gmail.com>
Date:   Mon, 27 Aug 2018 18:31:28 -0400

minor fixups

Diffstat:
M
src/ir.cpp
 | 
2
+-
M
test/cases/cast.zig
 | 
32
+++++++++++++++-----------------

2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/ir.cpp b/src/ir.cpp
@@ -8488,7 +8488,7 @@ static ConstCastOnly types_match_const_cast_only(IrAnalyze *ira, TypeTableEntry 
         return result;
     }
 
-    // *T and [*]T can always cast to ?*c_void
+    // *T and [*]T can always cast to *c_void
     if (wanted_type->id == TypeTableEntryIdPointer &&
         wanted_type->data.pointer.ptr_len == PtrLenSingle &&
         wanted_type->data.pointer.child_type == g->builtin_types.entry_c_void &&
diff --git a/test/cases/cast.zig b/test/cases/cast.zig
@@ -487,20 +487,20 @@ fn MakeType(comptime T: type) type {
 }
 
 test "implicit cast from *[N]T to ?[*]T" {
-  var x: ?[*]u16 = null;
-  var y: [4]u16 = [4]u16 {0, 1, 2, 3};
+    var x: ?[*]u16 = null;
+    var y: [4]u16 = [4]u16{ 0, 1, 2, 3 };
 
-  x = &y;
-  assert(std.mem.eql(u16, x.?[0..4], y[0..4]));
-  x.?[0] = 8;
-  y[3] = 6;
-  assert(std.mem.eql(u16, x.?[0..4], y[0..4]));
+    x = &y;
+    assert(std.mem.eql(u16, x.?[0..4], y[0..4]));
+    x.?[0] = 8;
+    y[3] = 6;
+    assert(std.mem.eql(u16, x.?[0..4], y[0..4]));
 }
 
 test "implicit cast from *T to ?*c_void" {
-  var a: u8 = 1;
-  incrementVoidPtrValue(&a);
-  std.debug.assert(a == 2);
+    var a: u8 = 1;
+    incrementVoidPtrValue(&a);
+    std.debug.assert(a == 2);
 }
 
 fn incrementVoidPtrValue(value: ?*c_void) void {
@@ -508,15 +508,14 @@ fn incrementVoidPtrValue(value: ?*c_void) void {
 }
 
 test "implicit cast from [*]T to ?*c_void" {
-  var a = []u8{3, 2, 1};
-  incrementVoidPtrArray(a[0..].ptr, 3);
-  std.debug.assert(std.mem.eql(u8, a, []u8{4, 3, 2}));
+    var a = []u8{ 3, 2, 1 };
+    incrementVoidPtrArray(a[0..].ptr, 3);
+    assert(std.mem.eql(u8, a, []u8{ 4, 3, 2 }));
 }
 
 fn incrementVoidPtrArray(array: ?*c_void, len: usize) void {
     var n: usize = 0;
-    while(n < len) : (n += 1) {
-        std.debug.warn("{}", n);
+    while (n < len) : (n += 1) {
         @ptrCast([*]u8, array.?)[n] += 1;
     }
-}
-\ No newline at end of file
+}