Changeset 92538ab for src/InitTweak/InitTweak.cc

Timestamp:

Apr 10, 2022, 2:53:18 PM (4 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

d8e2a09

Parents:

4559b34 (diff), 6256891 (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:

Resolve conflict

File:

• src/InitTweak/InitTweak.cc (modified) (2 diffs)

src/InitTweak/InitTweak.cc

@@ -423 +423 @@
                                 loc, targetLabel.newName(), { new ast::Attribute{ "unused" } } };
 
-                        std::vector< ast::ptr< ast::Stmt > > branches;
+                        std::vector< ast::ptr< ast::CaseClause > > branches;
                         for ( const ast::Init * init : *listInit ) {
                                 auto condition = ast::ConstantExpr::from_ulong( loc, cond );
@@ -432 +432 @@
                                 stmts.emplace_back(
                                         new ast::BranchStmt{ loc, ast::BranchStmt::Break, switchLabel } );
-                                branches.emplace_back( new ast::CaseStmt{ loc, condition, std::move( stmts ) } );
+                                branches.emplace_back( new ast::CaseClause{ loc, condition, std::move( stmts ) } );
                         }
                         out.emplace_back( new ast::SwitchStmt{ loc, index, std::move( branches ) } );