Changes in src/ResolvExpr/Resolver.cc [3090127:665f432]

File:

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

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Mar 27 11:58:00 2020
-// Update Count     : 242
+// Last Modified By : Aaron B. Moss
+// Last Modified On : Wed May 29 11:00:00 2019
+// Update Count     : 241
 //
 
@@ -84 +84 @@
                 void previsit( ThrowStmt * throwStmt );
                 void previsit( CatchStmt * catchStmt );
-                void postvisit( CatchStmt * catchStmt );
                 void previsit( WaitForStmt * stmt );
 
@@ -560 +559 @@
                 // TODO: Replace *exception type with &exception type.
                 if ( throwStmt->get_expr() ) {
-                        const StructDecl * exception_decl = indexer.lookupStruct( "__cfaehm_base_exception_t" );
+                        const StructDecl * exception_decl = indexer.lookupStruct( "__cfaabi_ehm__base_exception_t" );
                         assert( exception_decl );
                         Type * exceptType = new PointerType( noQualifiers, new StructInstType( noQualifiers, const_cast<StructDecl *>(exception_decl) ) );
@@ -568 +567 @@
 
         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 );
                 }
         }
@@ -1477 +1454 @@
                 if ( throwStmt->expr ) {
                         const ast::StructDecl * exceptionDecl =
-                                symtab.lookupStruct( "__cfaehm_base_exception_t" );
+                                symtab.lookupStruct( "__cfaabi_ehm__base_exception_t" );
                         assert( exceptionDecl );
                         ast::ptr< ast::Type > exceptType =
@@ -1489 +1466 @@
 
         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 };