authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-23 03:06:29-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2016-01-23 03:06:29-07:00
log37aae530098f10565ea3408891c901e086b8d5b8
tree8840efac116fcf0ec2270981bece58c0f93342ef
parent706f72f1b47ace8c6c9eecde2682ac46389af1ca

various small cleanups

3 files changed, 17 insertions(+), 15 deletions(-)

doc/vim/syntax/zig.vim+1-1
...@@ -9,7 +9,7 @@ endif...@@ -9,7 +9,7 @@ endif
99
10syn keyword zigStorage const var extern volatile export pub noalias10syn keyword zigStorage const var extern volatile export pub noalias
11syn keyword zigStructure struct enum11syn keyword zigStructure struct enum
12syn keyword zigStatement goto break return continue asm12syn keyword zigStatement goto break return continue asm defer
13syn keyword zigConditional if else switch13syn keyword zigConditional if else switch
14syn keyword zigRepeat while for14syn keyword zigRepeat while for
1515
example/cat/main.zig+14-13
...@@ -7,11 +7,10 @@ import "std.zig";...@@ -7,11 +7,10 @@ import "std.zig";
7// * update std API7// * update std API
8// * defer8// * defer
9// * %return9// * %return
10// * %% operator10// * %% binary operator
11// * %% prefix operator
11// * cast err type to string12// * cast err type to string
1213
13pub %.Invalid;
14
15pub fn main(args: [][]u8) %void => {14pub fn main(args: [][]u8) %void => {
16 const exe = args[0];15 const exe = args[0];
17 var catted_anything = false;16 var catted_anything = false;
...@@ -24,7 +23,7 @@ pub fn main(args: [][]u8) %void => {...@@ -24,7 +23,7 @@ pub fn main(args: [][]u8) %void => {
24 } else {23 } else {
25 var is: InputStream;24 var is: InputStream;
26 is.open(arg, OpenReadOnly) %% (err) => {25 is.open(arg, OpenReadOnly) %% (err) => {
27 stderr.print("Unable to open file: {}", ([]u8])(err));26 %%stderr.print("Unable to open file: {}", ([]u8])(err));
28 return err;27 return err;
29 }28 }
30 defer is.close();29 defer is.close();
...@@ -39,7 +38,7 @@ pub fn main(args: [][]u8) %void => {...@@ -39,7 +38,7 @@ pub fn main(args: [][]u8) %void => {
39}38}
4039
41fn usage(exe: []u8) %void => {40fn usage(exe: []u8) %void => {
42 stderr.print("Usage: {} [FILE]...\n", exe);41 %%stderr.print("Usage: {} [FILE]...\n", exe);
43 return %.Invalid;42 return %.Invalid;
44}43}
4544
...@@ -47,16 +46,18 @@ fn cat_stream(is: InputStream) %void => {...@@ -47,16 +46,18 @@ fn cat_stream(is: InputStream) %void => {
47 var buf: [1024 * 4]u8;46 var buf: [1024 * 4]u8;
4847
49 while (true) {48 while (true) {
50 const bytes_read = is.read(buf);49 const bytes_read = is.read(buf) %% (err) => {
51 if (bytes_read < 0) {50 %%stderr.print("Unable to read from stream: {}", ([]u8)(err));
52 stderr.print("Unable to read from stream: {}", ([]u8)(is.err));51 return err;
53 return is.err;52 }
53
54 if (bytes_read == 0) {
55 break;
54 }56 }
5557
56 const bytes_written = stdout.write(buf[0...bytes_read]);58 stdout.write(buf[0...bytes_read]) %% (err) => {
57 if (bytes_written < bytes_read) {59 %%stderr.print("Unable to write to stdout: {}", ([]u8)(err));
58 stderr.print("Unable to write to stdout: {}", ([]u8)(stdout.err));60 return err;
59 return stdout.err;
60 }61 }
61 }62 }
62}63}
std/std.zig+2-1
...@@ -23,6 +23,7 @@ pub var stderr = OutStream {...@@ -23,6 +23,7 @@ pub var stderr = OutStream {
23 .index = 0,23 .index = 0,
24 .buffered = false,24 .buffered = false,
25};25};
26*/
2627
27pub %.Unexpected;28pub %.Unexpected;
28pub %.DiskQuota;29pub %.DiskQuota;
...@@ -32,7 +33,7 @@ pub %.Io;...@@ -32,7 +33,7 @@ pub %.Io;
32pub %.NoSpaceLeft;33pub %.NoSpaceLeft;
33pub %.BadPerm;34pub %.BadPerm;
34pub %.PipeFail;35pub %.PipeFail;
35*/36pub %.Invalid;
3637
37const buffer_size = 4 * 1024;38const buffer_size = 4 * 1024;
38const max_u64_base10_digits = 20;39const max_u64_base10_digits = 20;