Changes in src/ResolvExpr/Resolver.cc [3b9c674:8fd52e90]

File:

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

src/ResolvExpr/Resolver.cc

@@ -84 +84 @@
                 void previsit( ThrowStmt * throwStmt );
                 void previsit( CatchStmt * catchStmt );
-                void postvisit( CatchStmt * catchStmt );
                 void previsit( WaitForStmt * stmt );
 
@@ -486 +485 @@
                 visit_children = false;
                 findVoidExpression( asmExpr->operand, indexer );
+                if ( asmExpr->get_inout() ) {
+                        findVoidExpression( asmExpr->inout, indexer );
+                } // if
         }
 
@@ -568 +570 @@
 
         void Resolver_old::previsit( 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 ( IfStmt * ifStmt = dynamic_cast<IfStmt *>( catchStmt->body ) ) {
-                        assert( ifStmt->thenPart );
-                }
-                // Encode the catchStmt so the condition can see the declaration.
                 if ( catchStmt->cond ) {
-                        IfStmt * ifStmt = new IfStmt( catchStmt->cond, nullptr, catchStmt->body );
-                        catchStmt->cond = nullptr;
-                        catchStmt->body = ifStmt;
-                }
-        }
-
-        void Resolver_old::postvisit( CatchStmt * catchStmt ) {
-                // Decode the catchStmt so everything is stored properly.
-                IfStmt * ifStmt = dynamic_cast<IfStmt *>( catchStmt->body );
-                if ( nullptr != ifStmt && nullptr == ifStmt->thenPart ) {
-                        assert( ifStmt->condition );
-                        assert( ifStmt->elsePart );
-                        catchStmt->cond = ifStmt->condition;
-                        catchStmt->body = ifStmt->elsePart;
-                        ifStmt->condition = nullptr;
-                        ifStmt->elsePart = nullptr;
-                        delete ifStmt;
+                        findSingleExpression( catchStmt->cond, new BasicType( noQualifiers, BasicType::Bool ), indexer );
                 }
         }
@@ -1386 +1366 @@
                         asmExpr, &ast::AsmExpr::operand, findVoidExpression( asmExpr->operand, symtab ) );
 
+                if ( asmExpr->inout ) {
+                        asmExpr = ast::mutate_field(
+                                asmExpr, &ast::AsmExpr::inout, findVoidExpression( asmExpr->inout, symtab ) );
+                }
+
                 return asmExpr;
         }
@@ -1489 +1474 @@
 
         const ast::CatchStmt * Resolver_new::previsit( const ast::CatchStmt * catchStmt ) {
-                // TODO: This will need a fix for the decl/cond scoping problem.
                 if ( catchStmt->cond ) {
                         ast::ptr< ast::Type > boolType = new ast::BasicType{ ast::BasicType::Bool };