authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-11-24 16:51:52-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-11-24 16:51:52-05:00
log4d747d452fba0987332244c777dfd3a29d5a20bd
treed279580c7909bfba85356177bdc95ea11d061e9e
parent3d2752cc3677535ddfbeeefba4036633bcab01dc
signature Commit is signed but in an unrecognized format.

update zen os std lib for latest zig changes

1 files changed, 11 insertions(+), 11 deletions(-)

std/os/zen.zig+11-11
...@@ -12,20 +12,20 @@ pub const Message = struct {...@@ -12,20 +12,20 @@ pub const Message = struct {
12 args: [5]usize,12 args: [5]usize,
13 payload: ?[]const u8,13 payload: ?[]const u8,
1414
15 pub fn from(mailbox_id: *const MailboxId) Message {15 pub fn from(mailbox_id: MailboxId) Message {
16 return Message{16 return Message{
17 .sender = MailboxId.Undefined,17 .sender = MailboxId.Undefined,
18 .receiver = mailbox_id.*,18 .receiver = mailbox_id,
19 .code = undefined,19 .code = undefined,
20 .args = undefined,20 .args = undefined,
21 .payload = null,21 .payload = null,
22 };22 };
23 }23 }
2424
25 pub fn to(mailbox_id: *const MailboxId, msg_code: usize, args: ...) Message {25 pub fn to(mailbox_id: MailboxId, msg_code: usize, args: ...) Message {
26 var message = Message{26 var message = Message{
27 .sender = MailboxId.This,27 .sender = MailboxId.This,
28 .receiver = mailbox_id.*,28 .receiver = mailbox_id,
29 .code = msg_code,29 .code = msg_code,
30 .args = undefined,30 .args = undefined,
31 .payload = null,31 .payload = null,
...@@ -40,14 +40,14 @@ pub const Message = struct {...@@ -40,14 +40,14 @@ pub const Message = struct {
40 return message;40 return message;
41 }41 }
4242
43 pub fn as(self: *const Message, sender: *const MailboxId) Message {43 pub fn as(self: Message, sender: MailboxId) Message {
44 var message = self.*;44 var message = self;
45 message.sender = sender.*;45 message.sender = sender;
46 return message;46 return message;
47 }47 }
4848
49 pub fn withPayload(self: *const Message, payload: []const u8) Message {49 pub fn withPayload(self: Message, payload: []const u8) Message {
50 var message = self.*;50 var message = self;
51 message.payload = payload;51 message.payload = payload;
52 return message;52 return message;
53 }53 }
...@@ -93,7 +93,7 @@ pub fn read(fd: i32, buf: [*]u8, count: usize) usize {...@@ -93,7 +93,7 @@ pub fn read(fd: i32, buf: [*]u8, count: usize) usize {
93 STDIN_FILENO => {93 STDIN_FILENO => {
94 var i: usize = 0;94 var i: usize = 0;
95 while (i < count) : (i += 1) {95 while (i < count) : (i += 1) {
96 send(Message.to(Server.Keyboard, 0));96 send(&Message.to(Server.Keyboard, 0));
9797
98 // FIXME: we should be certain that we are receiving from Keyboard.98 // FIXME: we should be certain that we are receiving from Keyboard.
99 var message = Message.from(MailboxId.This);99 var message = Message.from(MailboxId.This);
...@@ -111,7 +111,7 @@ pub fn read(fd: i32, buf: [*]u8, count: usize) usize {...@@ -111,7 +111,7 @@ pub fn read(fd: i32, buf: [*]u8, count: usize) usize {
111pub fn write(fd: i32, buf: [*]const u8, count: usize) usize {111pub fn write(fd: i32, buf: [*]const u8, count: usize) usize {
112 switch (fd) {112 switch (fd) {
113 STDOUT_FILENO, STDERR_FILENO => {113 STDOUT_FILENO, STDERR_FILENO => {
114 send(Message.to(Server.Terminal, 1).withPayload(buf[0..count]));114 send(&Message.to(Server.Terminal, 1).withPayload(buf[0..count]));
115 },115 },
116 else => unreachable,116 else => unreachable,
117 }117 }