parsing error value decls and error value literals
and return with '?' or '%' prefix
This commit is contained in:
166
std/std.zig
166
std/std.zig
@@ -1,43 +1,177 @@
|
||||
import "syscall.zig";
|
||||
//import "errno.zig";
|
||||
|
||||
pub const stdin_fileno : isize = 0;
|
||||
pub const stdout_fileno : isize = 1;
|
||||
pub const stderr_fileno : isize = 2;
|
||||
|
||||
// TODO error handling
|
||||
pub fn os_get_random_bytes(buf: []u8) isize => {
|
||||
getrandom(buf.ptr, buf.len, 0)
|
||||
/*
|
||||
pub var stdin = InStream {
|
||||
.fd = stdin_fileno,
|
||||
};
|
||||
|
||||
pub var stdout = OutStream {
|
||||
.fd = stdout_fileno,
|
||||
.buffer = uninitialized,
|
||||
.index = 0,
|
||||
.buffered = true,
|
||||
};
|
||||
|
||||
pub var stderr = OutStream {
|
||||
.fd = stderr_fileno,
|
||||
.buffer = uninitialized,
|
||||
.index = 0,
|
||||
.buffered = false,
|
||||
};
|
||||
|
||||
pub %.Unexpected;
|
||||
pub %.DiskQuota;
|
||||
pub %.FileTooBig;
|
||||
pub %.SigInterrupt;
|
||||
pub %.Io;
|
||||
pub %.NoSpaceLeft;
|
||||
pub %.BadPerm;
|
||||
pub %.PipeFail;
|
||||
*/
|
||||
|
||||
const buffer_size: u16 = 4 * 1024;
|
||||
const max_u64_base10_digits: isize = 20;
|
||||
|
||||
/*
|
||||
pub struct OutStream {
|
||||
fd: isize,
|
||||
buffer: [buffer_size]u8,
|
||||
index: @typeof(buffer_size),
|
||||
buffered: bool,
|
||||
|
||||
pub fn print_str(os: &OutStream, str: []const u8) %isize => {
|
||||
var src_bytes_left = str.len;
|
||||
var src_index: @typeof(str.len) = 0;
|
||||
const dest_space_left = os.buffer.len - index;
|
||||
|
||||
while (src_bytes_left > 0) {
|
||||
const copy_amt = min_isize(dest_space_left, src_bytes_left);
|
||||
@memcpy(&buffer[os.index], &str[src_index], copy_amt);
|
||||
os.index += copy_amt;
|
||||
if (os.index == os.buffer.len) {
|
||||
%return os.flush();
|
||||
}
|
||||
src_bytes_left -= copy_amt;
|
||||
}
|
||||
if (!os.buffered) {
|
||||
%return os.flush();
|
||||
}
|
||||
return str.len;
|
||||
}
|
||||
|
||||
pub fn print_u64(os: &OutStream, x: u64) %isize => {
|
||||
if (os.index + max_u64_base10_digits >= os.buffer.len) {
|
||||
%return os.flush();
|
||||
}
|
||||
const amt_printed = buf_print_u64(buf[os.index...], x);
|
||||
os.index += amt_printed;
|
||||
|
||||
if (!os.buffered) {
|
||||
%return os.flush();
|
||||
}
|
||||
|
||||
return amt_printed;
|
||||
}
|
||||
|
||||
|
||||
pub fn print_i64(os: &OutStream, x: i64) %isize => {
|
||||
if (os.index + max_u64_base10_digits >= os.buffer.len) {
|
||||
%return os.flush();
|
||||
}
|
||||
const amt_printed = buf_print_i64(buf[os.index...], x);
|
||||
os.index += amt_printed;
|
||||
|
||||
if (!os.buffered) {
|
||||
%return os.flush();
|
||||
}
|
||||
|
||||
return amt_printed;
|
||||
}
|
||||
|
||||
|
||||
pub fn flush(os: &OutStream) %void => {
|
||||
const amt_to_write = os.index;
|
||||
os.index = 0;
|
||||
switch (write(fd, os.buffer.ptr, amt_to_write)) {
|
||||
EINVAL => unreachable{},
|
||||
EDQUOT => %.DiskQuota,
|
||||
EFBIG => %.FileTooBig,
|
||||
EINTR => %.SigInterrupt,
|
||||
EIO => %.Io,
|
||||
ENOSPC => %.NoSpaceLeft,
|
||||
EPERM => %.BadPerm,
|
||||
EPIPE => %.PipeFail,
|
||||
else => %.Unexpected,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// TODO error handling
|
||||
// TODO handle buffering and flushing (mutex protected)
|
||||
pub struct InStream {
|
||||
fd: isize,
|
||||
|
||||
pub fn readline(buf: []u8) %isize => {
|
||||
const amt_read = read(stdin_fileno, buf.ptr, buf.len);
|
||||
if (amt_read < 0) {
|
||||
switch (-amt_read) {
|
||||
EINVAL => unreachable{},
|
||||
EFAULT => unreachable{},
|
||||
EBADF => %.BadFd,
|
||||
EINTR => %.SigInterrupt,
|
||||
EIO => %.Io,
|
||||
else => %.Unexpected,
|
||||
}
|
||||
}
|
||||
return amt_read;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
pub fn os_get_random_bytes(buf: []u8) %void => {
|
||||
switch (getrandom(buf.ptr, buf.len, 0)) {
|
||||
EINVAL => unreachable{},
|
||||
EFAULT => unreachable{},
|
||||
EINTR => %.SigInterrupt,
|
||||
else => %.Unexpected,
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
// TODO remove this
|
||||
pub fn print_str(str: []const u8) isize => {
|
||||
fprint_str(stdout_fileno, str)
|
||||
}
|
||||
|
||||
// TODO error handling
|
||||
// TODO handle buffering and flushing (mutex protected)
|
||||
// TODO remove this
|
||||
pub fn fprint_str(fd: isize, str: []const u8) isize => {
|
||||
write(fd, str.ptr, str.len)
|
||||
}
|
||||
|
||||
// TODO handle buffering and flushing (mutex protected)
|
||||
// TODO error handling
|
||||
// TODO remove this
|
||||
pub fn os_get_random_bytes(buf: []u8) isize => {
|
||||
getrandom(buf.ptr, buf.len, 0)
|
||||
}
|
||||
|
||||
// TODO remove this
|
||||
pub fn print_u64(x: u64) isize => {
|
||||
var buf: [max_u64_base10_digits]u8;
|
||||
const len = buf_print_u64(buf, x);
|
||||
return write(stdout_fileno, buf.ptr, len);
|
||||
}
|
||||
|
||||
// TODO handle buffering and flushing (mutex protected)
|
||||
// TODO error handling
|
||||
// TODO remove this
|
||||
pub fn print_i64(x: i64) isize => {
|
||||
var buf: [max_u64_base10_digits]u8;
|
||||
const len = buf_print_i64(buf, x);
|
||||
return write(stdout_fileno, buf.ptr, len);
|
||||
}
|
||||
|
||||
// TODO error handling
|
||||
// TODO remove this
|
||||
pub fn readline(buf: []u8, out_len: &isize) bool => {
|
||||
const amt_read = read(stdin_fileno, buf.ptr, buf.len);
|
||||
if (amt_read < 0) {
|
||||
@@ -47,7 +181,8 @@ pub fn readline(buf: []u8, out_len: &isize) bool => {
|
||||
return false;
|
||||
}
|
||||
|
||||
// TODO return ?u64 when we support returning struct byval
|
||||
|
||||
// TODO return %u64 when we support errors
|
||||
pub fn parse_u64(buf: []u8, radix: u8, result: &u64) bool => {
|
||||
var x : u64 = 0;
|
||||
|
||||
@@ -74,6 +209,7 @@ pub fn parse_u64(buf: []u8, radix: u8, result: &u64) bool => {
|
||||
}
|
||||
|
||||
fn char_to_digit(c: u8) u8 => {
|
||||
// TODO use switch with range
|
||||
if ('0' <= c && c <= '9') {
|
||||
c - '0'
|
||||
} else if ('A' <= c && c <= 'Z') {
|
||||
@@ -85,8 +221,6 @@ fn char_to_digit(c: u8) u8 => {
|
||||
}
|
||||
}
|
||||
|
||||
const max_u64_base10_digits: isize = 20;
|
||||
|
||||
fn buf_print_i64(out_buf: []u8, x: i64) isize => {
|
||||
if (x < 0) {
|
||||
out_buf[0] = '-';
|
||||
@@ -112,7 +246,7 @@ fn buf_print_u64(out_buf: []u8, x: u64) isize => {
|
||||
|
||||
const len = buf.len - index;
|
||||
|
||||
@memcpy(out_buf.ptr, &buf[index], len);
|
||||
@memcpy(&out_buf[0], &buf[index], len);
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user