Changes in src/Validate/Autogen.cpp [d6c464d:fb4dc28]

File:

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

src/Validate/Autogen.cpp

@@ -125 +125 @@
         // Built-ins do not use autogeneration.
         bool shouldAutogen() const final { return !decl->linkage.is_builtin && !structHasFlexibleArray(decl); }
-        void genADTFuncs();
-        void getADTFuncBody(const ast::ObjectDecl * lhs, ast::FunctionDecl * func);
 private:
         void genFuncBody( ast::FunctionDecl * decl ) final;
@@ -240 +238 @@
         if ( !enumDecl->body ) return;
 
+        // if ( auto enumBaseType = enumDecl->base ) {
+        //      if ( auto enumBaseTypeAsStructInst = dynamic_cast<const ast::StructInstType *>(enumBaseType.get()) ) {
+        //              const ast::StructDecl * structDecl = enumBaseTypeAsStructInst->base.get();
+        //              this->previsit( structDecl );
+        //      }
+        // }
+
         ast::EnumInstType enumInst( enumDecl->name );
         enumInst.base = enumDecl;
@@ -259 +264 @@
         }
         StructFuncGenerator gen( structDecl, &structInst, functionNesting );
-
-        gen.genADTFuncs();
         gen.generateAndAppendFunctions( declsToAddAfter );
 }
@@ -472 +475 @@
                 }
                 produceDecl( decl );
-        }
-}
-
-void StructFuncGenerator::getADTFuncBody(
-                const ast::ObjectDecl * lhs,
-                ast::FunctionDecl * func
-        ) {
-        const CodeLocation& location = func->location;
-        assert( decl->members.size() == 2 );
-        auto first = (decl->members[0]).as<ast::ObjectDecl>();
-        assert(first != nullptr);
-        auto firstType = first->type;
-        auto unionInstDecl = firstType.as<ast::UnionInstType>();
-        assert(unionInstDecl != nullptr);
-
-        auto unionDecl = unionInstDecl->base;
-        
-        const ast::ObjectDecl * dstParam =
-                        func->params.front().strict_as<ast::ObjectDecl>();
-        const ast::ObjectDecl * srcParam = 
-                        func->params.back().strict_as<ast::ObjectDecl>();
-        
-        ast::Expr * srcSelect = new ast::VariableExpr( location, srcParam );
-
-        ast::CompoundStmt * stmts = new ast::CompoundStmt( location );
-
-        InitTweak::InitExpander_new srcParamTweak( srcSelect );
-        ast::Expr * dstSelect = 
-        new ast::MemberExpr(
-                location,
-                lhs,
-                new ast::MemberExpr(
-                        location,
-                        first,
-                        new ast::CastExpr(
-                                location,
-                                new ast::VariableExpr( location, dstParam ),
-                                dstParam->type.strict_as<ast::ReferenceType>()->base
-                        )
-                )
-        );
-        auto stmt = genImplicitCall(
-                srcParamTweak, dstSelect, location, func->name,
-                first, SymTab::LoopForward
-        );
-        stmts->push_back( stmt );
-        func->stmts = stmts;
-} 
-
-void StructFuncGenerator::genADTFuncs() {
-        if ( decl->kind != ast::AggregateDecl::Adt ) return;
-        assert( decl->members.size() == 2 );
-        auto first = (decl->members[0]).as<ast::ObjectDecl>();
-        assert(first != nullptr);
-        auto firstType = first->type;
-        auto unionInstDecl = firstType.as<ast::UnionInstType>();
-        assert(unionInstDecl != nullptr);
-        auto unionDecl = unionInstDecl->base;
-
-        // for (auto mem: unionDecl->members) {
-        for ( std::size_t i = 0; i < unionDecl->members.size(); ++i ) {
-                auto mem = unionDecl->members[i];
-                const ast::ObjectDecl * mem_as_obj = mem.as<ast::ObjectDecl>();
-                assert( mem_as_obj );
-                auto mem_type = mem_as_obj->type.as<ast::StructInstType>();
-                assert( mem_type );
-                auto location = getLocation();
-                ast::FunctionDecl * func = new ast::FunctionDecl(
-                        getLocation(),
-                        "?{}", // name
-                        {}, //forall
-                        { dstParam(), new ast::ObjectDecl( getLocation(), "_src", ast::deepCopy( mem_type ) ) }, // params
-                        {}, // returns
-                        {}, // statements
-                        // Use static storage if we are at the top level.
-                        (0 < functionNesting) ? ast::Storage::Classes() : ast::Storage::Static,
-                        proto_linkage,
-                        std::vector<ast::ptr<ast::Attribute>>(),
-                        // Auto-generated routines are inline to avoid conflicts.
-                        ast::Function::Specs( ast::Function::Inline )
-                );
-                getADTFuncBody(mem_as_obj, func);
-                func->fixUniqueId();
-                produceForwardDecl(func);
-                if ( CodeGen::isAssignment( func->name ) ) {
-                        appendReturnThis( func );
-                }
-                produceDecl( func );
         }
 }