3429 - standardize Mu scenarios

A long-standing problem has been that I couldn't spread code across
'run' blocks because they were separate scopes, so I've ended up making
them effectively comments. Running code inside a 'run' block is
identical in every way to simply running the code directly. The 'run'
block is merely a visual aid to separate setup from the component under
test.

In the process I've also standardized all Mu scenarios to always run in
a local scope, and only use (raw) numeric addresses for values they want
to check later.

1 files changed, 7 insertions, 8 deletions

diff --git a/083scenario_screen_test.mu b/083scenario_screen_test.mu
index c10da8e6..a21a9fdf 100644
--- a/083scenario_screen_test.mu
+++ b/083scenario_screen_test.mu
@@ -1,9 +1,9 @@
 # To check our support for screens in scenarios, rewrite tests from print.mu
 
 scenario print-character-at-top-left-2 [
+  local-scope
   assume-screen 3/width, 2/height
   run [
-    local-scope
     a:char <- copy 97/a
     screen:&:screen <- print screen:&:screen, a
   ]
@@ -14,15 +14,14 @@ scenario print-character-at-top-left-2 [
 ]
 
 scenario clear-line-erases-printed-characters-2 [
+  local-scope
   assume-screen 5/width, 3/height
+  # print a character
+  a:char <- copy 97/a
+  screen:&:screen <- print screen:&:screen, a
+  # move cursor to start of line
+  screen:&:screen <- move-cursor screen:&:screen, 0/row, 0/column
   run [
-    local-scope
-    # print a character
-    a:char <- copy 97/a
-    screen:&:screen <- print screen:&:screen, a
-    # move cursor to start of line
-    screen:&:screen <- move-cursor screen:&:screen, 0/row, 0/column
-    # clear line
     screen:&:screen <- clear-line screen:&:screen
   ]
   screen-should-contain [