Merge branch 'release/0.40.1'

flax-lang · Jun 26, 2019 · d49d1c3 · d49d1c3
2 parents 83b0a1c + a9fb697
commit d49d1c3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/build/ultratiny.flx b/build/ultratiny.flx
@@ -7,7 +7,6 @@ export ultratiny
 import libc
 import std::math
 
-
 var value = 401.0
 
 #if value > 30.0

diff --git a/source/frontend/parser/controlflow.cpp b/source/frontend/parser/controlflow.cpp
@@ -100,15 +100,11 @@ namespace parser
 
 				c.body = parseBracedBlock(st);
 				cases.push_back(c);
-
-				if(isStaticIf) c.body->doNotPushNewScope = true;
 			}
 			else if(st.frontAfterWS() == TT::LBrace || st.frontAfterWS() == TT::FatRightArrow)
 			{
 				// ok, parse an else
 				elseCase = parseBracedBlock(st);
-				if(isStaticIf) elseCase->doNotPushNewScope = true;
-
 				break;
 			}
 			else
@@ -125,6 +121,11 @@ namespace parser
 			ret->cases = cases;
 			ret->elseCase = elseCase;
 
+			for(auto& c : ret->cases)
+				c.body->doNotPushNewScope = true;
+
+			ret->elseCase->doNotPushNewScope = true;
+
 			return ret;
 		}
 		else

diff --git a/source/typecheck/directives.cpp b/source/typecheck/directives.cpp
@@ -100,9 +100,7 @@ TCResult ast::IfDirective::typecheck(sst::TypecheckState* fs, fir::Type* infer)
 
 	if(!execBlock)
 	{
-		// ok we need to return a fake value.
-		auto ret = util::pool<sst::RawValueExpr>(this->loc, fir::Type::getVoid());
-		return TCResult(ret);
+		return TCResult::getDummy();
 	}
 	else
 	{