From 59e47aca14ce352a1814953df4be220406c94747 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Mon, 12 Sep 2016 10:00:43 -0700 Subject: 3341 Process type abbreviations in function headers. Still a couple of places where doing this causes strange errors. We'll track those down next. --- edit/001-editor.mu | 6 +++--- edit/002-typing.mu | 2 +- edit/004-programming-environment.mu | 4 ++-- edit/005-sandbox.mu | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'edit') diff --git a/edit/001-editor.mu b/edit/001-editor.mu index f59c43e1..83bd5edf 100644 --- a/edit/001-editor.mu +++ b/edit/001-editor.mu @@ -2,7 +2,7 @@ # temporary main for this layer: just render the given text at the given # screen dimensions, then stop -def! main text:address:array:character [ +def! main text:text [ local-scope load-ingredients open-console @@ -48,7 +48,7 @@ container editor-data [ # creates a new editor widget and renders its initial appearance to screen # top/left/right constrain the screen area available to the new editor # right is exclusive -def new-editor s:address:array:character, screen:address:screen, left:number, right:number -> result:address:editor-data, screen:address:screen [ +def new-editor s:text, screen:address:screen, left:number, right:number -> result:address:editor-data, screen:address:screen [ local-scope load-ingredients # no clipping of bounds @@ -71,7 +71,7 @@ def new-editor s:address:array:character, screen:address:screen, left:number, ri ] -def insert-text editor:address:editor-data, text:address:array:character -> editor:address:editor-data [ +def insert-text editor:address:editor-data, text:text -> editor:address:editor-data [ local-scope load-ingredients # early exit if text is empty diff --git a/edit/002-typing.mu b/edit/002-typing.mu index f30e50ec..d81cc991 100644 --- a/edit/002-typing.mu +++ b/edit/002-typing.mu @@ -2,7 +2,7 @@ # temporary main: interactive editor # hit ctrl-c to exit -def! main text:address:array:character [ +def! main text:text [ local-scope load-ingredients open-console diff --git a/edit/004-programming-environment.mu b/edit/004-programming-environment.mu index 261be52b..4f4c6e61 100644 --- a/edit/004-programming-environment.mu +++ b/edit/004-programming-environment.mu @@ -21,7 +21,7 @@ container programming-environment-data [ sandbox-in-focus?:boolean # false => cursor in recipes; true => cursor in current-sandbox ] -def new-programming-environment screen:address:screen, initial-recipe-contents:address:array:character, initial-sandbox-contents:address:array:character -> result:address:programming-environment-data, screen:address:screen [ +def new-programming-environment screen:address:screen, initial-recipe-contents:text, initial-sandbox-contents:text -> result:address:programming-environment-data, screen:address:screen [ local-scope load-ingredients width:number <- screen-width screen @@ -540,7 +540,7 @@ def update-cursor screen:address:screen, recipes:address:editor-data, current-sa ] # like 'render' for texts, but with colorization for comments like in the editor -def render-code screen:address:screen, s:address:array:character, left:number, right:number, row:number -> row:number, screen:address:screen [ +def render-code screen:address:screen, s:text, left:number, right:number, row:number -> row:number, screen:address:screen [ local-scope load-ingredients return-unless s diff --git a/edit/005-sandbox.mu b/edit/005-sandbox.mu index 507a6f0f..668a39f5 100644 --- a/edit/005-sandbox.mu +++ b/edit/005-sandbox.mu @@ -207,7 +207,7 @@ def! update-sandbox sandbox:address:sandbox-data, env:address:programming-enviro *sandbox <- put *sandbox, screen:offset, fake-screen ] -def update-status screen:address:screen, msg:address:array:character, color:number -> screen:address:screen [ +def update-status screen:address:screen, msg:text, color:number -> screen:address:screen [ local-scope load-ingredients screen <- move-cursor screen, 0, 2 @@ -355,7 +355,7 @@ def sandbox-menu-columns left:number, right:number -> edit-button-left:number, e # print a text 's' to 'editor' in 'color' starting at 'row' # clear rest of last line, move cursor to next line -def render-text screen:address:screen, s:address:array:character, left:number, right:number, color:number, row:number -> row:number, screen:address:screen [ +def render-text screen:address:screen, s:text, left:number, right:number, color:number, row:number -> row:number, screen:address:screen [ local-scope load-ingredients return-unless s @@ -601,7 +601,7 @@ scenario run-instruction-manages-screen-per-sandbox [ ] ] -def editor-contents editor:address:editor-data -> result:address:array:character [ +def editor-contents editor:address:editor-data -> result:text [ local-scope load-ingredients buf:address:buffer <- new-buffer 80 -- cgit 1.4.1-2-gfad0