fix(sema): increase scope to match an explicit else

Author: JohelEGP

regression-tests/pure2-last-use.cpp2

@@ -88,6 +88,15 @@ issue_884: () = {
   }
 }
 
+issue_884_2: () = {
+  x := new<int>(0);
+  if true { }
+  {
+    f_inout(x);
+  }
+  f_copy(x);
+}
+
 issue_888: (copy r: std::string, copy size: int) = {
   // ...
   _ = r.size();

regression-tests/test-results/pure2-last-use.cpp

@@ -20,7 +20,7 @@ class issue_857_2;
 class issue_857_3;
 
 
-#line 103 "pure2-last-use.cpp2"
+#line 112 "pure2-last-use.cpp2"
 class my_string;
 
 
@@ -91,12 +91,15 @@ class issue_857_3 {
 auto issue_884() -> void;
 
 #line 91 "pure2-last-use.cpp2"
+auto issue_884_2() -> void;
+
+#line 100 "pure2-last-use.cpp2"
 auto issue_888(std::string r, int size) -> void;
 
-#line 97 "pure2-last-use.cpp2"
+#line 106 "pure2-last-use.cpp2"
 auto draw() -> void;
 
-#line 103 "pure2-last-use.cpp2"
+#line 112 "pure2-last-use.cpp2"
 class my_string {
   public: std::string string; 
   public: std::size_t size {CPP2_UFCS(size)(string)}; 
@@ -200,6 +203,15 @@ auto issue_884() -> void{
   }
 }
 
+auto issue_884_2() -> void{
+  auto x {cpp2_new<int>(0)}; 
+  if (true) {}
+  {
+    f_inout(x);
+  }
+  f_copy(std::move(x));
+}
+
 auto issue_888(std::string r, int size) -> void{
   // ...
   static_cast<void>(CPP2_UFCS_MOVE(size)(std::move(r)));
@@ -212,10 +224,10 @@ auto draw() -> void{
   static_cast<void>(CPP2_UFCS_MOVE(vertex)((std::move(pos))));
 }
 
-#line 108 "pure2-last-use.cpp2"
+#line 117 "pure2-last-use.cpp2"
 auto main(int const argc_, char** argv_) -> int{
   auto const args = cpp2::make_args(argc_, argv_); 
-#line 109 "pure2-last-use.cpp2"
+#line 118 "pure2-last-use.cpp2"
   issue_683(args);
   issue_847_2(std::vector<std::unique_ptr<int>>());
 }

source/sema.h

@@ -1888,7 +1888,10 @@ class sema
         active_selections.pop_back();
         //  Extend the scope of an implicit else branch
         //  to the closing brace that contains it.
-        if (s.false_branch->position() != source_position(0, 0)) {
+        if (s.false_branch->position() == source_position(0, 0)) {
+            ++scope_depth;
+        }
+        else {
             --scope_depth;
         }
     }