about summary refs log tree commit diff stats
path: root/sandbox
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-01-27 17:12:12 -0800
committerKartik K. Agaram <vc@akkartik.com>2016-01-27 17:12:12 -0800
commit50689bff2ed59814a67e74e90a33717552d69df0 (patch)
treeb241a7981c0e1bb5780e0e63832e45b7057c447a /sandbox
parent95425355a01edf284a86d0873e63d88071221ed8 (diff)
downloadmu-50689bff2ed59814a67e74e90a33717552d69df0.tar.gz
2609 - reuse test-recipe variables in sandbox/ tests
I'd feared that the refcount errors in the previous commit meant there
was a bug in my ref-counting, so I temporarily used new variables rather
than reusing existing ones. But it turns out the one remaining place
memory corruption can happen is when recipes don't use default-scope and
so end up sharing memory. Don't I have a warning for this?
Diffstat (limited to 'sandbox')
-rw-r--r--sandbox/005-sandbox.mu5
-rw-r--r--sandbox/008-sandbox-test.mu4
2 files changed, 5 insertions, 4 deletions
diff --git a/sandbox/005-sandbox.mu b/sandbox/005-sandbox.mu
index 87f688ed..35d53beb 100644
--- a/sandbox/005-sandbox.mu
+++ b/sandbox/005-sandbox.mu
@@ -434,6 +434,7 @@ scenario run-updates-results [
   # define a recipe (no indent for the 'add' line below so column numbers are more obvious)
   1:address:shared:array:character <- new [ 
 recipe foo [
+local-scope
 z:number <- add 2, 2
 reply z
 ]]
@@ -456,7 +457,7 @@ reply z
     .                                                  .
   ]
   # make a change (incrementing one of the args to 'add'), then rerun
-  4:address:shared:array:character <- new [ 
+  1:address:shared:array:character <- new [ 
 recipe foo [
 z:number <- add 2, 3
 reply z
@@ -465,7 +466,7 @@ reply z
     press F4
   ]
   run [
-    event-loop screen:address:shared:screen, console:address:shared:console, 3:address:shared:programming-environment-data, 4:address:shared:array:character/recipes
+    event-loop screen:address:shared:screen, console:address:shared:console, 3:address:shared:programming-environment-data, 1:address:shared:array:character/recipes
   ]
   # check that screen updates the result on the right
   screen-should-contain [
diff --git a/sandbox/008-sandbox-test.mu b/sandbox/008-sandbox-test.mu
index a7344ba4..d08bb890 100644
--- a/sandbox/008-sandbox-test.mu
+++ b/sandbox/008-sandbox-test.mu
@@ -58,7 +58,7 @@ recipe foo [
     .                                                  .
   ]
   # now change the result
-  5:address:shared:array:character <- new [ 
+  1:address:shared:array:character <- new [ 
 recipe foo [
   reply 3
 ]]
@@ -67,7 +67,7 @@ recipe foo [
     press F4
   ]
   run [
-    event-loop screen:address:shared:screen, console:address:shared:console, 3:address:shared:programming-environment-data, 5:address:shared:array:character/new-test-recipes
+    event-loop screen:address:shared:screen, console:address:shared:console, 3:address:shared:programming-environment-data, 1:address:shared:array:character/new-test-recipes
   ]
   # result turns red
   screen-should-contain-in-color 1/red, [