From 6a546ea265d0ee30152298463e9e7b7c2f53b3b0 Mon Sep 17 00:00:00 2001
From: NeilBrown <neil@brown.name>
Date: Sun, 7 Nov 2021 10:00:29 +1100
Subject: [PATCH] oceani: fix up the while/do scope

The scope created for while/do does NOT extend into the case/else part.
This is because it is a repeating scope and needs to close and re-open.

We *could* include case/else in the final instance of that scope, but
I'm not at all sure that I want to.  Maybe later.

So close the scope properly and fix up the test code which depends on
the scope being extended.

Signed-off-by: NeilBrown <neil@brown.name>
---
 csrc/oceani-tests.mdc |  3 ++-
 csrc/oceani.mdc       | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/csrc/oceani-tests.mdc b/csrc/oceani-tests.mdc
index 973331f..2433cce 100644
--- a/csrc/oceani-tests.mdc
+++ b/csrc/oceani-tests.mdc
@@ -365,13 +365,14 @@ Here I break it into two parts, keeping the array code separate.
 			else
 				hi = mid
 			if hi - lo < 1:
+				lo = mid
 				use GiveUp
 			use True
 		do pass
 		case Found:
 			print "Yay, I found", target
 		case GiveUp:
-			print "Closest I found was", mid
+			print "Closest I found was", lo
 
 ###### output: sayhello,55,33,hello,True
 	Hello World, what lovely oceans you have!
diff --git a/csrc/oceani.mdc b/csrc/oceani.mdc
index 364ee29..2a40ff2 100644
--- a/csrc/oceani.mdc
+++ b/csrc/oceani.mdc
@@ -3873,12 +3873,14 @@ defined.
 			$0->condpart = $<SP;
 			$CP->next = $0->casepart;
 			$0->casepart = $<CP;
+			var_block_close(c, CloseSequential);
 			}$
 		| SwitchPart : IN OptNL CasePart CondSuffix OUT Newlines ${
 			$0 = $<CS;
 			$0->condpart = $<SP;
 			$CP->next = $0->casepart;
 			$0->casepart = $<CP;
+			var_block_close(c, CloseSequential);
 			}$
 		| IfPart IfSuffix ${
 			$0 = $<IS;
@@ -3890,9 +3892,6 @@ defined.
 
 	CondSuffix -> IfSuffix ${
 			$0 = $<1;
-			// This is where we close scope of the whole
-			// "for" or "while" statement
-			var_block_close(c, CloseSequential);
 		}$
 		| Newlines CasePart CondSuffix ${
 			$0 = $<CS;
@@ -3929,7 +3928,7 @@ defined.
 		}$
 
 	$*exec
-	// These scopes are closed in CondSuffix
+	// These scopes are closed in CondStatement
 	ForPart -> for OpenBlock ${
 			$0 = $<Bl;
 		}$
@@ -3940,14 +3939,16 @@ defined.
 		}$
 
 	$cond_statement
-	// This scope is closed in CondSuffix
+	// This scope is closed in CondStatement
 	WhilePart -> while UseBlock OptNL do Block ${
 			$0.condpart = $<UB;
 			$0.dopart = $<Bl;
+			var_block_close(c, CloseSequential);
 		}$
 		| while OpenScope Expression ColonBlock ${
 			$0.condpart = $<Exp;
 			$0.dopart = $<Bl;
+			var_block_close(c, CloseSequential);
 		}$
 
 	IfPart -> if UseBlock OptNL then OpenBlock ClosePara ${
@@ -3964,7 +3965,7 @@ defined.
 		}$
 
 	$*exec
-	// This scope is closed in CondSuffix
+	// This scope is closed in CondStatement
 	SwitchPart -> switch OpenScope Expression ${
 			$0 = $<Ex;
 		}$
@@ -4574,13 +4575,14 @@ things which will likely grow as the languages grows.
 			else
 				hi = mid
 			if hi - lo < 1:
+				lo = mid
 				use GiveUp
 			use True
 		do pass
 		case Found:
 			print "Yay, I found", target
 		case GiveUp:
-			print "Closest I found was", mid
+			print "Closest I found was", lo
 
 		size::= 10
 		list:[size]number
-- 
2.43.0