Changes in src/Validate/Autogen.cpp [1761046:0522ebe]

File:

• src/Validate/Autogen.cpp (modified) (8 diffs)

src/Validate/Autogen.cpp

@@ -133 +133 @@
         /// Generates a single struct member operation.
         /// (constructor call, destructor call, assignment call)
-        const ast::Stmt * makeMemberOp(
+        // This is managed because it uses another helper that returns a ast::ptr.
+        ast::ptr<ast::Stmt> makeMemberOp(
                 const CodeLocation& location,
                 const ast::ObjectDecl * dstParam, const ast::Expr * src,
@@ -205 +206 @@
         ast::FunctionDecl * genLabelProto() const;
         ast::FunctionDecl * genValueProto() const;
+        // ast::FunctionDecl * genValueProto2() const;
 };
 
@@ -523 +525 @@
 }
 
-const ast::Stmt * StructFuncGenerator::makeMemberOp(
+ast::ptr<ast::Stmt> StructFuncGenerator::makeMemberOp(
                 const CodeLocation& location, const ast::ObjectDecl * dstParam,
                 const ast::Expr * src, const ast::ObjectDecl * field,
@@ -538 +540 @@
                 )
         );
-        const ast::Stmt * stmt = genImplicitCall(
+        auto stmt = genImplicitCall(
                 srcParam, dstSelect, location, func->name,
                 field, direction
@@ -596 +598 @@
                         location, field, new ast::VariableExpr( location, srcParam )
                 ) : nullptr;
-                const ast::Stmt * stmt =
+                ast::ptr<ast::Stmt> stmt =
                         makeMemberOp( location, dstParam, srcSelect, field, func, direction );
 
                 if ( nullptr != stmt ) {
-                        stmts->kids.emplace_back( stmt );
+                        stmts->kids.push_back( stmt );
                 }
         }
@@ -621 +623 @@
         for ( auto param = params.begin() + 1 ; current != end ; ++current ) {
                 const ast::ptr<ast::Decl> & member = *current;
-                const ast::Stmt * stmt = nullptr;
+                ast::ptr<ast::Stmt> stmt = nullptr;
                 auto field = member.as<ast::ObjectDecl>();
                 // Not sure why it could be null.
@@ -639 +641 @@
 
                 if ( nullptr != stmt ) {
-                        stmts->kids.emplace_back( stmt );
+                        stmts->kids.push_back( stmt );
                 }
         }
@@ -789 +791 @@
 }
 
+// ast::FunctionDecl * EnumFuncGenerator::genValueProto2() const {
+//      return genProto( "valueE", 
+//              { new ast::ObjectDecl( getLocation(), "_i", new ast::EnumPosType( new ast::EnumInstType( decl ) ) )},
+//              { new ast::ObjectDecl( getLocation(), "_ret", ast::deepCopy( decl->base ) ) } );
+// }
+
 void EnumFuncGenerator::genAttrFuncForward() {  
         if ( decl->base ) {
                 ast::FunctionDecl *(EnumFuncGenerator::*attrProtos[3])() const = {
                         &EnumFuncGenerator::genPosProto, &EnumFuncGenerator::genLabelProto, 
-                        &EnumFuncGenerator::genValueProto };
+                        &EnumFuncGenerator::genValueProto
+                        // , &EnumFuncGenerator::genValueProto2 
+                        };
                 for ( auto & generator : attrProtos ) {
                         produceForwardDecl( (this->*generator)() );