Changeset a2e758e for src/AST/Convert.cpp
- Timestamp:
- May 23, 2019, 10:42:20 AM (6 years ago)
- Branches:
- ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
- Children:
- 335f2d8
- Parents:
- 0b8bf27 (diff), 0b57626 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/AST/Convert.cpp
r0b8bf27 ra2e758e 1130 1130 const ast::Type * visit( const ast::FunctionType * node ) override final { 1131 1131 auto ty = new FunctionType { 1132 cv( node ), 1132 cv( node ), 1133 1133 (bool)node->isVarArgs 1134 1134 }; … … 1328 1328 auto attr = new Attribute( 1329 1329 node->name, 1330 get<Expression>().acceptL(node->param eters)1330 get<Expression>().acceptL(node->params) 1331 1331 ); 1332 1332 this->node = attr; … … 1338 1338 // TypeSubstitution is not a node in the old model, so the conversion result wouldn't fit in this->node. 1339 1339 assert( 0 ); 1340 (void)node; 1340 1341 return nullptr; 1341 1342 } … … 1409 1410 # define GET_LABELS_V(labels) \ 1410 1411 to<std::vector>::from( make_labels( std::move( labels ) ) ) 1411 1412 1412 1413 static ast::CV::Qualifiers cv( Type * ty ) { return { ty->get_qualifiers().val }; } 1413 1414 … … 1549 1550 1550 1551 virtual void visit( TypeDecl * old ) override final { 1551 if ( inCache( old ) ) return; 1552 if ( inCache( old ) ) return; 1552 1553 auto decl = new ast::TypeDecl{ 1553 1554 old->location, … … 1587 1588 virtual void visit( AsmDecl * old ) override final { 1588 1589 auto decl = new ast::AsmDecl{ 1589 old->location, 1590 old->location, 1590 1591 GET_ACCEPT_1(stmt, AsmStmt) 1591 1592 }; … … 2142 2143 rslt = new ast::ConstantExpr( 2143 2144 old->location, 2144 GET_ACCEPT_1(result, Type), 2145 old->constant.get_value(), 2145 GET_ACCEPT_1(result, Type), 2146 old->constant.get_value(), 2146 2147 (double) old->constant.get_dval() 2147 2148 ); … … 2163 2164 assert(!old->isType); 2164 2165 rslt = new ast::SizeofExpr( 2165 old->location, 2166 old->location, 2166 2167 GET_ACCEPT_1(expr, Expr) 2167 2168 ); … … 2170 2171 assert(old->isType); 2171 2172 rslt = new ast::SizeofExpr( 2172 old->location, 2173 old->location, 2173 2174 GET_ACCEPT_1(type, Type) 2174 2175 ); … … 2184 2185 assert(!old->isType); 2185 2186 rslt = new ast::AlignofExpr( 2186 old->location, 2187 old->location, 2187 2188 GET_ACCEPT_1(expr, Expr) 2188 2189 ); … … 2191 2192 assert(old->isType); 2192 2193 rslt = new ast::AlignofExpr( 2193 old->location, 2194 old->location, 2194 2195 GET_ACCEPT_1(type, Type) 2195 2196 ); … … 2235 2236 GET_ACCEPT_1(arg1, Expr), 2236 2237 GET_ACCEPT_1(arg2, Expr), 2237 old->get_isAnd() ? 2238 old->get_isAnd() ? 2238 2239 ast::LogicalFlag::AndExpr : 2239 2240 ast::LogicalFlag::OrExpr
Note: See TracChangeset
for help on using the changeset viewer.