6570 - error on use of a clobbered var

All tests now passing, and factorial.mu and all other apps now working.
The new checks caught one problem in a few prototypes.

6 files changed, 42 insertions, 26 deletions

diff --git a/prototypes/browse/16-screen-state-broken.mu b/prototypes/browse/16-screen-state-broken.mu
index 7ab40060..6fe7f3eb 100644
--- a/prototypes/browse/16-screen-state-broken.mu
+++ b/prototypes/browse/16-screen-state-broken.mu
@@ -28,7 +28,7 @@ fn main args: (addr array (addr array byte)) -> exit-status/ebx: int {
   var ncols/ecx: int <- copy 0
   nrows, ncols <- screen-size
   var screen-position-state-storage: screen-position-state
-  var screen-position-state: (addr screen-position-state) = address screen-position-state-storage
+  var screen-position-state: (addr screen-position-state)
   init-screen-position-state screen-position-state, nrows, ncols
   {
     render file, screen-position-state
diff --git a/prototypes/browse/17-file-state-broken/main.mu b/prototypes/browse/17-file-state-broken/main.mu
index e95aff73..fc22d9ea 100644
--- a/prototypes/browse/17-file-state-broken/main.mu
+++ b/prototypes/browse/17-file-state-broken/main.mu
@@ -12,7 +12,7 @@ fn main args: (addr array (addr array byte)) -> exit-status/ebx: int {
   var ncols/ecx: int <- copy 0
   nrows, ncols <- screen-size
   var screen-position-state-storage: screen-position-state
-  var screen-position-state: (addr screen-position-state) = address screen-position-state-storage
+  var screen-position-state: (addr screen-position-state)
   init-screen-position-state screen-position-state, nrows, ncols
   {
     var done?/eax: boolean <- done-reading? fs
diff --git a/prototypes/browse/26-headers/main.mu b/prototypes/browse/26-headers/main.mu
index 4f6b53e3..8ce29b8e 100644
--- a/prototypes/browse/26-headers/main.mu
+++ b/prototypes/browse/26-headers/main.mu
@@ -126,9 +126,11 @@ $render-header-line:body: {
   var c/eax: byte <- copy 0
   {
     # if done-drawing?(state) return
-    var done?/eax: boolean <- done-drawing? state
-    compare done?, 0  # false
-    break-if-!= $render-header-line:body
+    {
+      var done?/eax: boolean <- done-drawing? state
+      compare done?, 0  # false
+      break-if-!= $render-header-line:body
+    }
     #
     c <- next-char fs
     # if (c != '#') break
@@ -142,9 +144,11 @@ $render-header-line:body: {
   start-heading header-level
   {
     # if done-drawing?(state) break
-    var done?/eax: boolean <- done-drawing? state
-    compare done?, 0  # false
-    break-if-!=
+    {
+      var done?/eax: boolean <- done-drawing? state
+      compare done?, 0  # false
+      break-if-!=
+    }
     #
     c <- next-char fs
     # if (c == EOF) break
diff --git a/prototypes/browse/27/main.mu b/prototypes/browse/27/main.mu
index 13764211..ea471c8b 100644
--- a/prototypes/browse/27/main.mu
+++ b/prototypes/browse/27/main.mu
@@ -133,9 +133,11 @@ $render-header-line:body: {
   var c/eax: byte <- copy 0
   {
     # if done-drawing?(state) return
-    var done?/eax: boolean <- done-drawing? state
-    compare done?, 0  # false
-    break-if-!= $render-header-line:body
+    {
+      var done?/eax: boolean <- done-drawing? state
+      compare done?, 0  # false
+      break-if-!= $render-header-line:body
+    }
     #
     c <- next-char fs
     # if (c != '#') break
@@ -149,9 +151,11 @@ $render-header-line:body: {
   start-heading header-level
   {
     # if done-drawing?(state) break
-    var done?/eax: boolean <- done-drawing? state
-    compare done?, 0  # false
-    break-if-!=
+    {
+      var done?/eax: boolean <- done-drawing? state
+      compare done?, 0  # false
+      break-if-!=
+    }
     #
     c <- next-char fs
     # if (c == EOF) break
diff --git a/prototypes/browse/28/main.mu b/prototypes/browse/28/main.mu
index 0f7458e6..398890f3 100644
--- a/prototypes/browse/28/main.mu
+++ b/prototypes/browse/28/main.mu
@@ -135,9 +135,11 @@ $render-header-line:body: {
   var c/eax: byte <- copy 0
   {
     # if done-drawing?(state) return
-    var done?/eax: boolean <- done-drawing? state
-    compare done?, 0  # false
-    break-if-!= $render-header-line:body
+    {
+      var done?/eax: boolean <- done-drawing? state
+      compare done?, 0  # false
+      break-if-!= $render-header-line:body
+    }
     #
     c <- next-char fs
     # if (c != '#') break
@@ -151,9 +153,11 @@ $render-header-line:body: {
   start-heading header-level
   {
     # if done-drawing?(state) break
-    var done?/eax: boolean <- done-drawing? state
-    compare done?, 0  # false
-    break-if-!=
+    {
+      var done?/eax: boolean <- done-drawing? state
+      compare done?, 0  # false
+      break-if-!=
+    }
     #
     c <- next-char fs
     # if (c == EOF) break
diff --git a/prototypes/browse/29/main.mu b/prototypes/browse/29/main.mu
index ea9cdf02..5bbb0586 100644
--- a/prototypes/browse/29/main.mu
+++ b/prototypes/browse/29/main.mu
@@ -145,9 +145,11 @@ $render-header-line:body: {
   var c/eax: byte <- copy 0
   {
     # if done-drawing?(state) return
-    var done?/eax: boolean <- done-drawing? state
-    compare done?, 0  # false
-    break-if-!= $render-header-line:body
+    {
+      var done?/eax: boolean <- done-drawing? state
+      compare done?, 0  # false
+      break-if-!= $render-header-line:body
+    }
     #
     c <- next-char fs
     # if (c != '#') break
@@ -161,9 +163,11 @@ $render-header-line:body: {
   start-heading header-level
   {
     # if done-drawing?(state) break
-    var done?/eax: boolean <- done-drawing? state
-    compare done?, 0  # false
-    break-if-!=
+    {
+      var done?/eax: boolean <- done-drawing? state
+      compare done?, 0  # false
+      break-if-!=
+    }
     #
     c <- next-char fs
     # if (c == EOF) break