diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2016-09-17 00:31:55 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2016-09-17 00:31:55 -0700 |
| commit | 08f4628e8b858120fe3547d8e5431d9abfe46bf8 (patch) | |
| tree | 4d9f1bc0039baefa0e84d9cb3ea6634f4337d342 /084console.mu | |
| parent | 58a9f7c34e21541f2db90b7fb66f4e92f04780ef (diff) | |
| download | mu-08f4628e8b858120fe3547d8e5431d9abfe46bf8.tar.gz | |
3379
Can't use type abbreviations inside 'memory-should-contain'.
Diffstat (limited to '084console.mu')
| -rw-r--r-- | 084console.mu | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/084console.mu b/084console.mu index e736642f..8d7633e7 100644 --- a/084console.mu +++ b/084console.mu @@ -2,7 +2,7 @@ # and are thus easier to test. exclusive-container event [ - text:character + text:char keycode:number # keys on keyboard without a unicode representation touch:touch-event # mouse, track ball, etc. resize:resize-event @@ -59,22 +59,22 @@ def read-event console:address:console -> result:event, console:address:console, # variant of read-event for just keyboard events. Discards everything that # isn't unicode, so no arrow keys, page-up/page-down, etc. But you still get # newlines, tabs, ctrl-d.. -def read-key console:address:console -> result:character, console:address:console, found?:boolean, quit?:boolean [ +def read-key console:address:console -> result:char, console:address:console, found?:boolean, quit?:boolean [ local-scope load-ingredients x:event, console, found?:boolean, quit?:boolean <- read-event console return-if quit?, 0, console/same-as-ingredient:0, found?, quit? return-unless found?, 0, console/same-as-ingredient:0, found?, quit? - c:character, converted?:boolean <- maybe-convert x, text:variant + c:char, converted?:boolean <- maybe-convert x, text:variant return-unless converted?, 0, console/same-as-ingredient:0, 0/found, 0/quit return c, console/same-as-ingredient:0, 1/found, 0/quit ] -def send-keys-to-channel console:address:console, chan:address:sink:character, screen:address:screen -> console:address:console, chan:address:sink:character, screen:address:screen [ +def send-keys-to-channel console:address:console, chan:address:sink:char, screen:address:screen -> console:address:console, chan:address:sink:char, screen:address:screen [ local-scope load-ingredients { - c:character, console, found?:boolean, quit?:boolean <- read-key console + c:char, console, found?:boolean, quit?:boolean <- read-key console loop-unless found? break-if quit? assert c, [invalid event, expected text] |