oceani: CloseParallel must mark anything not Pending as OutScope

Testing doesn't trip on this yet, but will in a future patch.

Signed-off-by: NeilBrown <neil@brown.name>

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index fc9f0bd8cbefd97ce14d9a331be67241d66c8e2d..776c1a67dddc990ff67c8e1405b41db34c2ed0b2 100644 (file)
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -193,7 +193,7 @@ Test merging of variables from multiple cases
                for i:=0; then i=i+1; while i < 5:
                        switch i:
                                case 0: num:="zero"
-                               case 1: num:="one"
+                               case 1: scratch:=42; num:="one"
                                case 2: num:="two"
                                case 3: num:="three"
                                else    num:="many"

diff --git a/csrc/oceani.mdc b/csrc/oceani.mdc
index 7e1f2ac788117dddae2f9e2529e3d34ec8389aac..215a9a709bca6b4ebe568a0b6a1e3ca2e5e252d5 100644 (file)
--- a/csrc/oceani.mdc
+++ b/csrc/oceani.mdc
@@ -1176,9 +1176,11 @@ all pending-scope variables become conditionally scoped.
                                                 v->previous->scope == PendingScope)
                                                /* all previous branches used name */
                                                v->scope = PendingScope;
-                                       else if (v->type == Tlabel)     // UNTESTED
+                                       else if (v->type == Tlabel)
                                                /* Labels remain pending even when not used */
                                                v->scope = PendingScope;        // UNTESTED
+                                       else
+                                               v->scope = OutScope;
                                        if (ct == CloseElse) {
                                                /* All Pending variables with this name
                                                 * are now Conditional */