From 50689bff2ed59814a67e74e90a33717552d69df0 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Wed, 27 Jan 2016 17:12:12 -0800 Subject: 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? --- sandbox/005-sandbox.mu | 5 +++-- sandbox/008-sandbox-test.mu | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'sandbox') 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, [ -- cgit 1.4.1-2-gfad0