| ... | ... | @@ -12,20 +12,20 @@ pub const Message = struct { |
| 12 | 12 | args: [5]usize, |
| 13 | 13 | payload: ?[]const u8, |
| 14 | 14 | |
| 15 | | pub fn from(mailbox_id: *const MailboxId) Message { |
| 15 | pub fn from(mailbox_id: MailboxId) Message { |
| 16 | 16 | return Message{ |
| 17 | 17 | .sender = MailboxId.Undefined, |
| 18 | | .receiver = mailbox_id.*, |
| 18 | .receiver = mailbox_id, |
| 19 | 19 | .code = undefined, |
| 20 | 20 | .args = undefined, |
| 21 | 21 | .payload = null, |
| 22 | 22 | }; |
| 23 | 23 | } |
| 24 | 24 | |
| 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 | 26 | var message = Message{ |
| 27 | 27 | .sender = MailboxId.This, |
| 28 | | .receiver = mailbox_id.*, |
| 28 | .receiver = mailbox_id, |
| 29 | 29 | .code = msg_code, |
| 30 | 30 | .args = undefined, |
| 31 | 31 | .payload = null, |
| ... | ... | @@ -40,14 +40,14 @@ pub const Message = struct { |
| 40 | 40 | return message; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | | pub fn as(self: *const Message, sender: *const MailboxId) Message { |
| 44 | | var message = self.*; |
| 45 | | message.sender = sender.*; |
| 43 | pub fn as(self: Message, sender: MailboxId) Message { |
| 44 | var message = self; |
| 45 | message.sender = sender; |
| 46 | 46 | return message; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | | pub fn withPayload(self: *const Message, payload: []const u8) Message { |
| 50 | | var message = self.*; |
| 49 | pub fn withPayload(self: Message, payload: []const u8) Message { |
| 50 | var message = self; |
| 51 | 51 | message.payload = payload; |
| 52 | 52 | return message; |
| 53 | 53 | } |
| ... | ... | @@ -93,7 +93,7 @@ pub fn read(fd: i32, buf: [*]u8, count: usize) usize { |
| 93 | 93 | STDIN_FILENO => { |
| 94 | 94 | var i: usize = 0; |
| 95 | 95 | while (i < count) : (i += 1) { |
| 96 | | send(Message.to(Server.Keyboard, 0)); |
| 96 | send(&Message.to(Server.Keyboard, 0)); |
| 97 | 97 | |
| 98 | 98 | // FIXME: we should be certain that we are receiving from Keyboard. |
| 99 | 99 | var message = Message.from(MailboxId.This); |
| ... | ... | @@ -111,7 +111,7 @@ pub fn read(fd: i32, buf: [*]u8, count: usize) usize { |
| 111 | 111 | pub fn write(fd: i32, buf: [*]const u8, count: usize) usize { |
| 112 | 112 | switch (fd) { |
| 113 | 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 | 116 | else => unreachable, |
| 117 | 117 | } |
Andrew Kelley <andrew@ziglang.org> 2018-11-24 16:51:52-05:00