Changes in src/ResolvExpr/Resolver.cc [b9fa85b:e6b42e7]

File:

• src/ResolvExpr/Resolver.cc (modified) (2 diffs)

src/ResolvExpr/Resolver.cc

@@ -1259 +1259 @@
                 const ast::ThrowStmt *       previsit( const ast::ThrowStmt * );
                 const ast::CatchStmt *       previsit( const ast::CatchStmt * );
-                const ast::CatchStmt *       postvisit( const ast::CatchStmt * );
                 const ast::WaitForStmt *     previsit( const ast::WaitForStmt * );
 
@@ -1492 +1491 @@
 
         const ast::CatchStmt * Resolver_new::previsit( const ast::CatchStmt * catchStmt ) {
-                // Until we are very sure this invarent (ifs that move between passes have thenPart)
-                // holds, check it. This allows a check for when to decode the mangling.
-                if ( auto ifStmt = catchStmt->body.as<ast::IfStmt>() ) {
-                        assert( ifStmt->thenPart );
-                }
-                // Encode the catchStmt so the condition can see the declaration.
+                // TODO: This will need a fix for the decl/cond scoping problem.
                 if ( catchStmt->cond ) {
-                        ast::CatchStmt * stmt = mutate( catchStmt );
-                        stmt->body = new ast::IfStmt( stmt->location, stmt->cond, nullptr, stmt->body );
-                        stmt->cond = nullptr;
-                        return stmt;
-                }
-                return catchStmt;
-        }
-
-        const ast::CatchStmt * Resolver_new::postvisit( const ast::CatchStmt * catchStmt ) {
-                // Decode the catchStmt so everything is stored properly.
-                const ast::IfStmt * ifStmt = catchStmt->body.as<ast::IfStmt>();
-                if ( nullptr != ifStmt && nullptr == ifStmt->thenPart ) {
-                        assert( ifStmt->cond );
-                        assert( ifStmt->elsePart );
-                        ast::CatchStmt * stmt = ast::mutate( catchStmt );
-                        stmt->cond = ifStmt->cond;
-                        stmt->body = ifStmt->elsePart;
-                        // ifStmt should be implicately deleted here.
-                        return stmt;
+                        ast::ptr< ast::Type > boolType = new ast::BasicType{ ast::BasicType::Bool };
+                        catchStmt = ast::mutate_field(
+                                catchStmt, &ast::CatchStmt::cond,
+                                findSingleExpression( catchStmt->cond, boolType, symtab ) );
                 }
                 return catchStmt;