428 - cleanup odds and ends

1 files changed, 12 insertions, 12 deletions

diff --git a/edit.mu b/edit.mu
index d4937c60..706d5de4 100644
--- a/edit.mu
+++ b/edit.mu
@@ -1,18 +1,18 @@
 ; a screen is an array of pointers to lines, in turn arrays of characters
 
 (function new-screen [
-  ((default-scope scope-address) <- new (scope literal) (30 literal))
-  ((nrows integer) <- next-input)
-  ((ncols integer) <- next-input)
-  ((result screen-address) <- new (screen literal) (nrows integer))
-  ((rowidx integer) <- copy (0 literal))
+  (default-scope:scope-address <- new scope:literal 30:literal)
+  (nrows:integer <- next-input)
+  (ncols:integer <- next-input)
+  (result:screen-address <- new screen:literal nrows:integer)
+  (rowidx:integer <- copy 0:literal)
   { begin
-    ((curr-line-address-address line-address-address) <- index-address (result screen-address deref) (rowidx integer))
-    ((curr-line-address-address line-address-address deref) <- new (line literal) (ncols integer))
-    ((curr-line-address line-address) <- copy (curr-line-address-address line-address-address deref))
-    ((rowidx integer) <- add (rowidx integer) (1 literal))
-    ((x boolean) <- not-equal (rowidx integer) (nrows integer))
-    (loop-if (x boolean))
+    (curr-line-address-address:line-address-address <- index-address result:screen-address/deref rowidx:integer)
+    (curr-line-address-address:line-address-address/deref <- new line:literal ncols:integer)
+    (curr-line-address:line-address <- copy curr-line-address-address:line-address-address/deref)
+    (rowidx:integer <- add rowidx:integer 1:literal)
+    (x:boolean <- not-equal rowidx:integer nrows:integer)
+    (loop-if x:boolean)
   }
-  (reply (result screen-address))
+  (reply result:screen-address)
 ])