Changeset a4da45e for src/Validate

Timestamp:

Feb 26, 2024, 3:53:42 AM (7 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

3f9a8d0

Parents:

0522ebe (diff), 022bce0 (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/Validate/Autogen.cpp (modified) (6 diffs)

src/Validate/Autogen.cpp

@@ -133 +133 @@
         /// Generates a single struct member operation.
         /// (constructor call, destructor call, assignment call)
-        // This is managed because it uses another helper that returns a ast::ptr.
-        ast::ptr<ast::Stmt> makeMemberOp(
+        const ast::Stmt * makeMemberOp(
                 const CodeLocation& location,
                 const ast::ObjectDecl * dstParam, const ast::Expr * src,
@@ -525 +524 @@
 }
 
-ast::ptr<ast::Stmt> StructFuncGenerator::makeMemberOp(
+const ast::Stmt * StructFuncGenerator::makeMemberOp(
                 const CodeLocation& location, const ast::ObjectDecl * dstParam,
                 const ast::Expr * src, const ast::ObjectDecl * field,
@@ -540 +539 @@
                 )
         );
-        auto stmt = genImplicitCall(
+        const ast::Stmt * stmt = genImplicitCall(
                 srcParam, dstSelect, location, func->name,
                 field, direction
@@ -598 +597 @@
                         location, field, new ast::VariableExpr( location, srcParam )
                 ) : nullptr;
-                ast::ptr<ast::Stmt> stmt =
+                const ast::Stmt * stmt =
                         makeMemberOp( location, dstParam, srcSelect, field, func, direction );
 
                 if ( nullptr != stmt ) {
-                        stmts->kids.push_back( stmt );
+                        stmts->kids.emplace_back( stmt );
                 }
         }
@@ -623 +622 @@
         for ( auto param = params.begin() + 1 ; current != end ; ++current ) {
                 const ast::ptr<ast::Decl> & member = *current;
-                ast::ptr<ast::Stmt> stmt = nullptr;
+                const ast::Stmt * stmt = nullptr;
                 auto field = member.as<ast::ObjectDecl>();
                 // Not sure why it could be null.
@@ -641 +640 @@
 
                 if ( nullptr != stmt ) {
-                        stmts->kids.push_back( stmt );
+                        stmts->kids.emplace_back( stmt );
                 }
         }