Changeset 417117e for src/ResolvExpr

Timestamp:

Jun 28, 2019, 3:50:21 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

03bf5c8

Parents:

55b6476

Message:

Assorted cleanup

Location:

src/ResolvExpr

Files:

• CandidateFinder.cpp (modified) (1 diff)
• ResolveTypeof.cc (modified) (1 diff)
• Resolver.cc (modified) (4 diffs)

src/ResolvExpr/CandidateFinder.cpp

@@ -370 +370 @@
                                                         // push empty tuple expression
                                                         newResult.parent = i;
-                                                        std::vector< ast::ptr< ast::Expr > > emptyList;
-                                                        newResult.expr = 
-                                                                new ast::TupleExpr{ CodeLocation{}, move( emptyList ) };
+                                                        newResult.expr = new ast::TupleExpr{ CodeLocation{}, {} };
                                                         argType = newResult.expr->result;
                                                 } else {

src/ResolvExpr/ResolveTypeof.cc

@@ -153 +153 @@
                         }
 
-                        return newType;
+                        return newType.release();
                 }
         };

src/ResolvExpr/Resolver.cc

@@ -1109 +1109 @@
                 
                 // set up and resolve expression cast to void
-                ast::CastExpr * untyped = new ast::CastExpr{ expr };
+                ast::ptr< ast::CastExpr > untyped = new ast::CastExpr{ expr };
                 CandidateRef choice = findUnfinishedKindExpression( 
                         untyped, symtab, "", anyCandidate, ResolvMode::withAdjustment() );
@@ -1248 +1248 @@
         };
 
-        void resolve( std::list< ast::ptr<ast::Decl> >& translationUnit ) {
+        void resolve( std::list< ast::ptr< ast::Decl > >& translationUnit ) {
                 ast::Pass< Resolver_new > resolver;
                 accept_all( translationUnit, resolver );
@@ -1282 +1282 @@
                 ast::ptr< ast::FunctionDecl > ret = functionDecl;
                 for ( unsigned i = 0; i < functionDecl->type->params.size(); ++i ) {
-                        const ast::ptr<ast::DeclWithType> & d = functionDecl->type->params[i];
+                        const ast::ptr< ast::DeclWithType > & d = functionDecl->type->params[i];
 
                         if ( const ast::ObjectDecl * obj = d.as< ast::ObjectDecl >() ) {
@@ -1299 +1299 @@
                         }
                 }
-                return ret.get();
+                return ret.release();
         }