- Timestamp:
- May 29, 2019, 3:45:00 PM (5 years ago)
- 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:
- 0aedb01
- Parents:
- 157a816 (diff), ebc0a85 (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. - Location:
- src/AST
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/AST/Convert.cpp
r157a816 rf57dd25 884 884 ); 885 885 886 rslt->tempDecls = get<ObjectDecl>().acceptL(node->tempDecls);887 rslt->returnDecls = get<ObjectDecl>().acceptL(node->returnDecls);888 rslt->dtors = get<Expression>().acceptL(node->dtors);889 890 886 auto expr = visitBaseExpr( node, rslt ); 891 887 this->node = expr; … … 2282 2278 ); 2283 2279 2284 rslt->tempDecls = GET_ACCEPT_V(tempDecls, ObjectDecl);2285 rslt->returnDecls = GET_ACCEPT_V(returnDecls, ObjectDecl);2286 rslt->dtors = GET_ACCEPT_V(dtors, Expr);2287 2288 2280 this->node = visitBaseExpr( old, rslt ); 2289 2281 } -
src/AST/Expr.hpp
r157a816 rf57dd25 530 530 public: 531 531 ptr<ApplicationExpr> callExpr; 532 std::vector<ptr<ObjectDecl>> tempDecls;533 std::vector<ptr<ObjectDecl>> returnDecls;534 std::vector<ptr<Expr>> dtors;535 532 536 533 ImplicitCopyCtorExpr( const CodeLocation& loc, const ApplicationExpr * call ) 537 : Expr( loc, call->result ) , tempDecls(), returnDecls(), dtors(){ assert( call ); }534 : Expr( loc, call->result ) { assert( call ); } 538 535 539 536 const Expr * accept( Visitor & v ) const override { return v.visit( this ); } -
src/AST/Pass.impl.hpp
r157a816 rf57dd25 1319 1319 } 1320 1320 maybe_accept( node, &ImplicitCopyCtorExpr::callExpr ); 1321 maybe_accept( node, &ImplicitCopyCtorExpr::tempDecls );1322 maybe_accept( node, &ImplicitCopyCtorExpr::returnDecls );1323 maybe_accept( node, &ImplicitCopyCtorExpr::dtors );1324 1321 ) 1325 1322 -
src/AST/Print.cpp
r157a816 rf57dd25 1023 1023 os << "Implicit Copy Constructor Expression:" << endl << indent; 1024 1024 safe_print( node->callExpr ); 1025 os << endl << indent-1 << "... with temporaries:" << endl;1026 printAll( node->tempDecls );1027 os << endl << indent-1 << "... with return temporaries:" << endl;1028 printAll( node->returnDecls );1029 1025 --indent; 1030 1026 postprint( node );
Note: See TracChangeset
for help on using the changeset viewer.