Changeset bb336a6 for src/Validate/Autogen.cpp

Timestamp:

Jul 10, 2024, 3:39:26 AM (6 weeks ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

dbff8ec

Parents:

550afde2

Message:

Fixed the problem when enum use another enumerator as initializer

File:

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

src/Validate/Autogen.cpp

@@ -88 +88 @@
 
         // Internal helpers:
-        void genStandardFuncs();
+        virtual void genStandardFuncs();
         void produceDecl( const ast::FunctionDecl * decl );
         void produceForwardDecl( const ast::FunctionDecl * decl );
@@ -196 +196 @@
 
         bool shouldAutogen() const final { return true; }
+        void generateAndPrependDecls( std::list<ast::ptr<ast::Decl>> & );
+        void genForwards();
 private:
         void genFuncBody( ast::FunctionDecl * decl ) final;
         void genFieldCtors() final;
         const ast::Decl * getDecl() const final { return decl; }
+protected:
+        void genStandardFuncs() override;
 };
 
@@ -242 +246 @@
         enumInst.base = enumDecl;
         EnumFuncGenerator gen( enumDecl, &enumInst, functionNesting );
-        gen.generateAndAppendFunctions( declsToAddAfter );
+        gen.generateAndPrependDecls( declsToAddBefore );
+
+        EnumFuncGenerator gen2( enumDecl, &enumInst, functionNesting );
+        gen2.generateAndAppendFunctions( declsToAddAfter );
 }
 
@@ -709 +716 @@
 }
 
+void EnumFuncGenerator::generateAndPrependDecls( std::list<ast::ptr<ast::Decl>> & decls ) {
+        genForwards();
+        decls.splice( decls.end(), forwards );
+}
+
+void EnumFuncGenerator::genForwards() {
+        forwards.push_back( ast::asForward(decl) );
+
+        ast::FunctionDecl *(FuncGenerator::*standardProtos[4])() const = {
+                &EnumFuncGenerator::genCtorProto, &EnumFuncGenerator::genCopyProto,
+                &EnumFuncGenerator::genDtorProto, &EnumFuncGenerator::genAssignProto };
+
+        for ( auto & generator: standardProtos) {
+                ast::FunctionDecl * decl = (this->*generator)();
+                produceForwardDecl( decl );
+        }
+}
+
+void EnumFuncGenerator::genStandardFuncs() {
+        // do everything FuncGenerator does except not make ForwardDecls
+        ast::FunctionDecl *(FuncGenerator::*standardProtos[4])() const = {
+                &EnumFuncGenerator::genCtorProto, &EnumFuncGenerator::genCopyProto,
+                &EnumFuncGenerator::genDtorProto, &EnumFuncGenerator::genAssignProto };
+
+        for ( auto & generator : standardProtos ) {
+                ast::FunctionDecl * decl = (this->*generator)();
+                // produceForwardDecl( decl ); Done in genForwards
+                genFuncBody( decl );
+                if ( CodeGen::isAssignment( decl->name ) ) {
+                        appendReturnThis( decl );
+                }
+                produceDecl( decl );
+        }
+}
+
 void EnumFuncGenerator::genFieldCtors() {
         // Enumerations to not have field constructors.