authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2019-09-25 18:17:29+03:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-09-25 12:44:11-04:00
log14ae23326ee3b20f706051b37c169c872337af8c
treee1d962adf539cac59fa6035b58905c3ab47bcfb6
parent29e6541db1ad79656a3a7743de65bd452ea64bce

ran zig fmt on stdlib

4 files changed, 13 insertions(+), 7 deletions(-)

std/bloom_filter.zig+6-2
...@@ -84,7 +84,9 @@ pub fn BloomFilter(...@@ -84,7 +84,9 @@ pub fn BloomFilter(
84 pub fn add(self: *Self, item: []const u8) void {84 pub fn add(self: *Self, item: []const u8) void {
85 comptime var i = 0;85 comptime var i = 0;
86 inline while (i < K) : (i += 1) {86 inline while (i < K) : (i += 1) {
87 var K_th_bit: packed struct { x: Index } = undefined;87 var K_th_bit: packed struct {
88 x: Index,
89 } = undefined;
88 hash(std.mem.asBytes(&K_th_bit), i, item);90 hash(std.mem.asBytes(&K_th_bit), i, item);
89 incrementCell(self, K_th_bit.x);91 incrementCell(self, K_th_bit.x);
90 }92 }
...@@ -93,7 +95,9 @@ pub fn BloomFilter(...@@ -93,7 +95,9 @@ pub fn BloomFilter(
93 pub fn contains(self: Self, item: []const u8) bool {95 pub fn contains(self: Self, item: []const u8) bool {
94 comptime var i = 0;96 comptime var i = 0;
95 inline while (i < K) : (i += 1) {97 inline while (i < K) : (i += 1) {
96 var K_th_bit: packed struct { x: Index } = undefined;98 var K_th_bit: packed struct {
99 x: Index,
100 } = undefined;
97 hash(std.mem.asBytes(&K_th_bit), i, item);101 hash(std.mem.asBytes(&K_th_bit), i, item);
98 if (getCell(self, K_th_bit.x) == cellEmpty)102 if (getCell(self, K_th_bit.x) == cellEmpty)
99 return false;103 return false;
std/debug.zig+3-2
...@@ -2415,7 +2415,8 @@ stdcallcc fn handleSegfaultWindows(info: *windows.EXCEPTION_POINTERS) c_long {...@@ -2415,7 +2415,8 @@ stdcallcc fn handleSegfaultWindows(info: *windows.EXCEPTION_POINTERS) c_long {
2415}2415}
24162416
2417pub fn dumpStackPointerAddr(prefix: []const u8) void {2417pub fn dumpStackPointerAddr(prefix: []const u8) void {
2418 const sp = asm ("" : [argc] "={rsp}" (-> usize));2418 const sp = asm (""
2419 : [argc] "={rsp}" (-> usize)
2420 );
2419 std.debug.warn("{} sp = 0x{x}\n", prefix, sp);2421 std.debug.warn("{} sp = 0x{x}\n", prefix, sp);
2420}2422}
2421
std/os/linux/arm-eabi.zig+2-2
...@@ -90,7 +90,7 @@ pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, a...@@ -90,7 +90,7 @@ pub extern fn clone(func: extern fn (arg: usize) u8, stack: usize, flags: u32, a
90// that to llvm via zig, see https://github.com/ziglang/zig/issues/2883.90// that to llvm via zig, see https://github.com/ziglang/zig/issues/2883.
91// LLVM expects libc to provide this function as __aeabi_read_tp, so it is exported if needed from special/c.zig.91// LLVM expects libc to provide this function as __aeabi_read_tp, so it is exported if needed from special/c.zig.
92pub extern fn getThreadPointer() usize {92pub extern fn getThreadPointer() usize {
93 return asm volatile("mrc p15, 0, %[ret], c13, c0, 3"93 return asm volatile ("mrc p15, 0, %[ret], c13, c0, 3"
94 : [ret] "=r" (-> usize)94 : [ret] "=r" (-> usize)
95 );95 );
96}
\ No newline at end of file
96}
std/zig/parse.zig+2-1
...@@ -234,7 +234,8 @@ fn parseTopLevelDecl(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node...@@ -234,7 +234,8 @@ fn parseTopLevelDecl(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node
234234
235 if (extern_export_inline_token) |token| {235 if (extern_export_inline_token) |token| {
236 if (tree.tokens.at(token).id == .Keyword_inline or236 if (tree.tokens.at(token).id == .Keyword_inline or
237 tree.tokens.at(token).id == .Keyword_noinline) {237 tree.tokens.at(token).id == .Keyword_noinline)
238 {
238 putBackToken(it, token);239 putBackToken(it, token);
239 return null;240 return null;
240 }241 }