Changeset 9fe33947 for src

Timestamp:

Dec 22, 2017, 1:48:44 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

6dfa2e1

Parents:

523232d

Message:

Minor code cleanup

Location:

src

Files:

• InitTweak/FixInit.cc (modified) (4 diffs)
• InitTweak/GenInit.cc (modified) (1 diff)
• SynTree/Expression.cc (modified) (1 diff)

src/InitTweak/FixInit.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// FixInit.h --
+// FixInit.cc --
 //
 // Author           : Rob Schluntz
@@ -365 +365 @@
                         // arrays are not copy constructed, so this should always be an ExprStmt
                         ImplicitCtorDtorStmt * stmt = genCtorDtor( fname, var, cpArg );
-                        ExprStmt * exprStmt = strict_dynamic_cast< ExprStmt * >( stmt->get_callStmt() );
+                        assertf( stmt, "ResolveCopyCtors: genCtorDtor returned nullptr: %s / %s / %s", fname.c_str(), toString( var ).c_str(), toString( cpArg ).c_str() );
+                        ExprStmt * exprStmt = strict_dynamic_cast< ExprStmt * >( stmt->callStmt );
                         Expression * resolved = exprStmt->expr;
                         exprStmt->expr = nullptr; // take ownership of expr
@@ -594 +595 @@
                         // to the outer context, rather than inside of the statement expression.
                         visit_children = false;
-                        std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
+                        std::list< Statement * > & stmts = stmtExpr->statements->get_kids();
                         for ( Statement *& stmt : stmts ) {
                                 stmt = stmt->acceptMutator( *visitor );
                         } // for
-                        assert( stmtExpr->get_result() );
-                        Type * result = stmtExpr->get_result();
+                        assert( stmtExpr->result );
+                        Type * result = stmtExpr->result;
                         if ( ! result->isVoid() ) {
-                                for ( ObjectDecl * obj : stmtExpr->get_returnDecls() ) {
+                                for ( ObjectDecl * obj : stmtExpr->returnDecls ) {
                                         stmtsToAddBefore.push_back( new DeclStmt( obj ) );
                                 } // for
                                 // add destructors after current statement
-                                for ( Expression * dtor : stmtExpr->get_dtors() ) {
+                                for ( Expression * dtor : stmtExpr->dtors ) {
                                         stmtsToAddAfter.push_back( new ExprStmt( dtor ) );
                                 } // for
@@ -611 +612 @@
                                 assert( ! stmts.empty() );
                                 assertf( ! stmtExpr->get_returnDecls().empty(), "StmtExpr returns non-void, but no return decls: %s", toString( stmtExpr ).c_str() );
-                                stmts.push_back( new ExprStmt( new VariableExpr( stmtExpr->get_returnDecls().front() ) ) );
-                                stmtExpr->get_returnDecls().clear();
-                                stmtExpr->get_dtors().clear();
-                        }
-                        assert( stmtExpr->get_returnDecls().empty() );
-                        assert( stmtExpr->get_dtors().empty() );
+                                stmts.push_back( new ExprStmt( new VariableExpr( stmtExpr->returnDecls.front() ) ) );
+                                stmtExpr->returnDecls.clear();
+                                stmtExpr->dtors.clear();
+                        }
+                        assert( stmtExpr->returnDecls.empty() );
+                        assert( stmtExpr->dtors.empty() );
                 }
 

src/InitTweak/GenInit.cc

@@ -135 +135 @@
                                 if ( varExpr->var == retVal ) return;
                         }
-                        stmtsToAddBefore.push_back( genCtorDtor( "?{}", retVal, returnStmt->get_expr() ) );
+                        Statement * stmt = genCtorDtor( "?{}", retVal, returnStmt->expr );
+                        assertf( stmt, "ReturnFixer: genCtorDtor returned nullptr: %s / %s", toString( retVal ).c_str(), toString( returnStmt->expr ).c_str() );
+                        stmtsToAddBefore.push_back( stmt );
 
                         // return the retVal object

src/SynTree/Expression.cc

@@ -589 +589 @@
         if ( ! body.empty() ) {
                 if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( body.back() ) ) {
-                        set_result( maybeClone( exprStmt->get_expr()->get_result() ) );
+                        result = maybeClone( exprStmt->expr->result );
                 }
         }
         // ensure that StmtExpr has a result type
         if ( ! result ) {
-                set_result( new VoidType( Type::Qualifiers() ) );
+                result = new VoidType( Type::Qualifiers() );
         }
 }