3015 - more symbolic names in tests

There's still a problem: if I ever want to use any of the special
scenario variables like 'screen', 'console', etc., then I can't use
'local-scope' in my scenario.

1 files changed, 12 insertions, 10 deletions

diff --git a/079table.mu b/079table.mu
index 40b3ff34..4c98cf91 100644
--- a/079table.mu
+++ b/079table.mu
@@ -3,24 +3,26 @@
 
 scenario table-read-write [
   run [
-    1:address:table:number:number <- new-table 30
-    put 1:address:table:number:number, 12, 34
-    2:number <- index 1:address:table:number:number, 12
+    local-scope
+    tab:address:table:number:number <- new-table 30
+    put-index tab, 12, 34
+    1:number/raw <- index tab, 12
   ]
   memory-should-contain [
-    2 <- 34
+    1 <- 34
   ]
 ]
 
 scenario table-read-write-non-integer [
   run [
-    1:address:array:character <- new [abc def]
-    {2: (address table (address array character) number)} <- new-table 30
-    put {2: (address table (address array character) number)}, 1:address:array:character, 34
-    3:number <- index {2: (address table (address array character) number)}, 1:address:array:character
+    local-scope
+    key:address:array:character <- new [abc def]
+    {tab: (address table (address array character) number)} <- new-table 30
+    put-index tab, key, 34
+    1:number/raw <- index tab, key
   ]
   memory-should-contain [
-    3 <- 34
+    1 <- 34
   ]
 ]
 
@@ -44,7 +46,7 @@ def new-table capacity:number -> result:address:table:_key:_value [
   *result <- merge 0/length, capacity, data
 ]
 
-def put table:address:table:_key:_value, key:_key, value:_value -> table:address:table:_key:_value [
+def put-index table:address:table:_key:_value, key:_key, value:_value -> table:address:table:_key:_value [
   local-scope
   load-ingredients
   hash:number <- hash key