Changeset 54dd994 for src/ResolvExpr/Resolver.cc

Timestamp:

Jun 24, 2019, 10:30:47 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

84917e2

Parents:

3c6e417 (diff), 9e0a360 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/ResolvExpr/Resolver.cc

@@ -1109 +1109 @@
                 
                 // set up and resolve expression cast to void
-                ast::CastExpr * untyped = new ast::CastExpr{ expr->location, expr };
+                ast::CastExpr * untyped = new ast::CastExpr{ expr };
                 CandidateRef choice = findUnfinishedKindExpression( 
                         untyped, symtab, "", anyCandidate, ResolvMode::withAdjustment() );
@@ -1161 +1161 @@
                 ) {
                         assert( untyped && type );
-                        ast::ptr< ast::Expr > castExpr = new ast::CastExpr{ untyped->location, untyped, type };
+                        ast::ptr< ast::Expr > castExpr = new ast::CastExpr{ untyped, type };
                         ast::ptr< ast::Expr > newExpr = findSingleExpression( castExpr, symtab );
                         removeExtraneousCast( newExpr, symtab );
@@ -1251 +1251 @@
                 ast::Pass< Resolver_new > resolver;
                 accept_all( translationUnit, resolver );
+        }
+
+        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 );
         }