Changeset 234b1cb for src/ResolvExpr

Timestamp:

Jun 20, 2019, 2:32:55 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

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

Children:

b8524ca, f5edcb4

Parents:

c0f9efe

Message:

Port TupleAssignment to new AST

Location:

src/ResolvExpr

Files:

• Alternative.cc (modified) (1 diff)
• Alternative.h (modified) (1 diff)
• Candidate.hpp (modified) (1 diff)
• Resolver.cc (modified) (1 diff)
• Resolver.h (modified) (2 diffs)

src/ResolvExpr/Alternative.cc

@@ -125 +125 @@
         }
 
-        void splice( AltList& dst, AltList& src ) {
-                dst.reserve( dst.size() + src.size() );
-                for ( Alternative& alt : src ) {
-                        dst.push_back( std::move(alt) );
-                }
-                src.clear();
-        }
-
-        void spliceBegin( AltList& dst, AltList& src ) {
-                splice( src, dst );
-                dst.swap( src );
-        }
-
 } // namespace ResolvExpr
 

src/ResolvExpr/Alternative.h

@@ -112 +112 @@
         typedef std::vector< Alternative > AltList;
 
-        /// Moves all elements from src to the end of dst
-        void splice( AltList& dst, AltList& src );
-
-        /// Moves all elements from src to the beginning of dst
-        void spliceBegin( AltList& dst, AltList& src );
-
         static inline std::ostream & operator<<(std::ostream & os, const ResolvExpr::Alternative & alt) {
                 alt.print( os );

src/ResolvExpr/Candidate.hpp

@@ -75 +75 @@
 using CandidateList = std::vector< CandidateRef >;
 
-/// Splice src after dst, clearing src
-static inline void splice( CandidateList & dst, CandidateList & src ) {
-        dst.reserve( dst.size() + src.size() );
-        for ( CandidateRef & r : src ) { dst.emplace_back( std::move( r ) ); }
-        src.clear();
-}
-
-/// Splice src before dst
-static inline void spliceBegin( CandidateList & dst, CandidateList & src ) {
-        splice( src, dst );
-        dst.swap( src );
-}
-
 /// Sum the cost of a list of candidates
 static inline Cost sumCost( const CandidateList & candidates ) {

src/ResolvExpr/Resolver.cc

@@ -1253 +1253 @@
         }
 
+        ast::ptr< ast::Init > resolveCtorInit( 
+                const ast::ConstructorInit * ctorInit, const ast::SymbolTable & symtab 
+        ) {
+                assert( ctorInit );
+                ast::Pass< Resolver_new > resolver{ symtab };
+                return ctorInit->accept( resolver );
+        }
+
         ast::ptr< ast::Expr > resolveStmtExpr( 
                 const ast::StmtExpr * stmtExpr, const ast::SymbolTable & symtab 

src/ResolvExpr/Resolver.h

@@ -29 +29 @@
 
 namespace ast {
+        class ConstructorInit;
         class Decl;
         class DeletedExpr;
+        class Init;
         class StmtExpr;
         class SymbolTable;
@@ -59 +61 @@
         ast::ptr< ast::Expr > resolveInVoidContext(
                 const ast::Expr * expr, const ast::SymbolTable & symtab, ast::TypeEnvironment & env );
+        /// Resolves a constructor init expression
+        ast::ptr< ast::Init > resolveCtorInit( 
+                const ast::ConstructorInit * ctorInit, const ast::SymbolTable & symtab );
         /// Resolves a statement expression
         ast::ptr< ast::Expr > resolveStmtExpr(