mirror of
https://github.com/c3lang/c3c.git
synced 2026-02-27 12:01:16 +00:00
- Create optional with ~ instead of ?. return io::EOF?; becomes return io::EOF~.
- Deprecated use of `?` to create optional.
This commit is contained in:
@@ -83,7 +83,7 @@ macro usz? read_all(stream, char[] buffer)
|
||||
{
|
||||
if (buffer.len == 0) return 0;
|
||||
usz n = stream.read(buffer)!;
|
||||
if (n != buffer.len) return UNEXPECTED_EOF?;
|
||||
if (n != buffer.len) return UNEXPECTED_EOF~;
|
||||
return n;
|
||||
}
|
||||
|
||||
@@ -120,7 +120,7 @@ macro usz? write_all(stream, char[] buffer)
|
||||
{
|
||||
if (buffer.len == 0) return 0;
|
||||
usz n = stream.write(buffer)!;
|
||||
if (n != buffer.len) return INCOMPLETE_WRITE?;
|
||||
if (n != buffer.len) return INCOMPLETE_WRITE~;
|
||||
return n;
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@ macro usz? read_using_read_byte(s, char[] buffer)
|
||||
if (catch err = c)
|
||||
{
|
||||
if (err == io::EOF) return len;
|
||||
return err?;
|
||||
return err~;
|
||||
}
|
||||
*cptr = c;
|
||||
len++;
|
||||
@@ -160,7 +160,7 @@ macro char? read_byte_using_read(s)
|
||||
{
|
||||
char[1] buffer;
|
||||
usz read = s.read(&buffer)!;
|
||||
if (read != 1) return io::EOF?;
|
||||
if (read != 1) return io::EOF~;
|
||||
return buffer[0];
|
||||
}
|
||||
|
||||
@@ -205,12 +205,12 @@ macro usz? copy_through_buffer(InStream in, OutStream dst, char[] buffer) @local
|
||||
if (catch err = len)
|
||||
{
|
||||
if (err == io::EOF) return total_copied;
|
||||
return err?;
|
||||
return err~;
|
||||
}
|
||||
if (!len) return total_copied;
|
||||
usz written = dst.write(buffer[:len])!;
|
||||
total_copied += len;
|
||||
if (written != len) return INCOMPLETE_WRITE?;
|
||||
if (written != len) return INCOMPLETE_WRITE~;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -232,8 +232,8 @@ macro usz? read_varint(stream, x_ptr)
|
||||
char? c = stream.read_byte();
|
||||
if (catch err = c)
|
||||
{
|
||||
if (err == io::EOF) return io::UNEXPECTED_EOF?;
|
||||
return err?;
|
||||
if (err == io::EOF) return io::UNEXPECTED_EOF~;
|
||||
return err~;
|
||||
}
|
||||
n++;
|
||||
if (c & 0x80 == 0)
|
||||
@@ -249,7 +249,7 @@ macro usz? read_varint(stream, x_ptr)
|
||||
x |= (c & 0x7F) << shift;
|
||||
shift += 7;
|
||||
}
|
||||
return math::OVERFLOW?;
|
||||
return math::OVERFLOW~;
|
||||
}
|
||||
<*
|
||||
@require @is_outstream(stream)
|
||||
|
||||
Reference in New Issue
Block a user