authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-06-01 01:22:22-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-06-01 01:22:35-04:00
log5f38a01edeaa150bef741c940311a9e15d0cd327
treee422b4d009c4acb225b7b9cfd456477f73992b7f
parent4d13ab07de85e8dd357f7d894f5b2d09e6305115

run zig fmt

3 files changed, 43 insertions(+), 12 deletions(-)

std/heap.zig+1-1
...@@ -343,7 +343,7 @@ pub const ThreadSafeFixedBufferAllocator = struct {...@@ -343,7 +343,7 @@ pub const ThreadSafeFixedBufferAllocator = struct {
343 if (new_end_index > self.buffer.len) {343 if (new_end_index > self.buffer.len) {
344 return error.OutOfMemory;344 return error.OutOfMemory;
345 }345 }
346 end_index = @cmpxchgWeak(usize, &self.end_index, end_index, new_end_index, builtin.AtomicOrder.SeqCst, builtin.AtomicOrder.SeqCst,) ?? return self.buffer[adjusted_index..new_end_index];346 end_index = @cmpxchgWeak(usize, &self.end_index, end_index, new_end_index, builtin.AtomicOrder.SeqCst, builtin.AtomicOrder.SeqCst) ?? return self.buffer[adjusted_index..new_end_index];
347 }347 }
348 }348 }
349349
std/zig/render.zig+15-2
...@@ -1765,7 +1765,13 @@ const Space = enum {...@@ -1765,7 +1765,13 @@ const Space = enum {
1765 BlockStart,1765 BlockStart,
1766};1766};
17671767
1768fn renderTokenOffset(tree: *ast.Tree, stream: var, token_index: ast.TokenIndex, indent: usize, start_col: *usize, space: Space,1768fn renderTokenOffset(
1769 tree: *ast.Tree,
1770 stream: var,
1771 token_index: ast.TokenIndex,
1772 indent: usize,
1773 start_col: *usize,
1774 space: Space,
1769 token_skip_bytes: usize,1775 token_skip_bytes: usize,
1770) (@typeOf(stream).Child.Error || Error)!void {1776) (@typeOf(stream).Child.Error || Error)!void {
1771 if (space == Space.BlockStart) {1777 if (space == Space.BlockStart) {
...@@ -1933,7 +1939,14 @@ fn renderTokenOffset(tree: *ast.Tree, stream: var, token_index: ast.TokenIndex,...@@ -1933,7 +1939,14 @@ fn renderTokenOffset(tree: *ast.Tree, stream: var, token_index: ast.TokenIndex,
1933 }1939 }
1934}1940}
19351941
1936fn renderToken(tree: *ast.Tree, stream: var, token_index: ast.TokenIndex, indent: usize, start_col: *usize, space: Space,) (@typeOf(stream).Child.Error || Error)!void {1942fn renderToken(
1943 tree: *ast.Tree,
1944 stream: var,
1945 token_index: ast.TokenIndex,
1946 indent: usize,
1947 start_col: *usize,
1948 space: Space,
1949) (@typeOf(stream).Child.Error || Error)!void {
1937 return renderTokenOffset(tree, stream, token_index, indent, start_col, space, 0);1950 return renderTokenOffset(tree, stream, token_index, indent, start_col, space, 0);
1938}1951}
19391952
test/cases/math.zig+27-9
...@@ -28,13 +28,27 @@ fn testDivision() void {...@@ -28,13 +28,27 @@ fn testDivision() void {
28 assert(divTrunc(f32, -5.0, 3.0) == -1.0);28 assert(divTrunc(f32, -5.0, 3.0) == -1.0);
2929
30 comptime {30 comptime {
31 assert(1194735857077236777412821811143690633098347576 % 508740759824825164163191790951174292733114988 == 177254337427586449086438229241342047632117600,);31 assert(
32 assert(@rem(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -177254337427586449086438229241342047632117600,);32 1194735857077236777412821811143690633098347576 % 508740759824825164163191790951174292733114988 == 177254337427586449086438229241342047632117600,
33 assert(1194735857077236777412821811143690633098347576 / 508740759824825164163191790951174292733114988 == 2,);33 );
34 assert(@divTrunc(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -2,);34 assert(
35 assert(@divTrunc(1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == -2,);35 @rem(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -177254337427586449086438229241342047632117600,
36 assert(@divTrunc(-1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == 2,);36 );
37 assert(4126227191251978491697987544882340798050766755606969681711 % 10 == 1,);37 assert(
38 1194735857077236777412821811143690633098347576 / 508740759824825164163191790951174292733114988 == 2,
39 );
40 assert(
41 @divTrunc(-1194735857077236777412821811143690633098347576, 508740759824825164163191790951174292733114988) == -2,
42 );
43 assert(
44 @divTrunc(1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == -2,
45 );
46 assert(
47 @divTrunc(-1194735857077236777412821811143690633098347576, -508740759824825164163191790951174292733114988) == 2,
48 );
49 assert(
50 4126227191251978491697987544882340798050766755606969681711 % 10 == 1,
51 );
38 }52 }
39}53}
40fn div(comptime T: type, a: T, b: T) T {54fn div(comptime T: type, a: T, b: T) T {
...@@ -324,8 +338,12 @@ test "big number addition" {...@@ -324,8 +338,12 @@ test "big number addition" {
324338
325test "big number multiplication" {339test "big number multiplication" {
326 comptime {340 comptime {
327 assert(45960427431263824329884196484953148229 * 128339149605334697009938835852565949723 == 5898522172026096622534201617172456926982464453350084962781392314016180490567,);341 assert(
328 assert(594491908217841670578297176641415611445982232488944558774612 * 390603545391089362063884922208143568023166603618446395589768 == 232210647056203049913662402532976186578842425262306016094292237500303028346593132411865381225871291702600263463125370016,);342 45960427431263824329884196484953148229 * 128339149605334697009938835852565949723 == 5898522172026096622534201617172456926982464453350084962781392314016180490567,
343 );
344 assert(
345 594491908217841670578297176641415611445982232488944558774612 * 390603545391089362063884922208143568023166603618446395589768 == 232210647056203049913662402532976186578842425262306016094292237500303028346593132411865381225871291702600263463125370016,
346 );
329 }347 }
330}348}
331349