Changeset af746cc for src/Validate/Autogen.cpp

Timestamp:

Apr 15, 2024, 12:03:53 PM (4 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

dc58e5d

Parents:

d9bad51

Message:

Reimplement the resolution of Enum instance type

File:

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

src/Validate/Autogen.cpp

@@ -196 +196 @@
 
         bool shouldAutogen() const final { return true; }
-        void genAttrFuncForward();
-        void genPosFunctions();
 private:
         void genFuncBody( ast::FunctionDecl * decl ) final;
         void genFieldCtors() final;
         const ast::Decl * getDecl() const final { return decl; }
-
-        ast::FunctionDecl * genPosProto() const;
-        ast::FunctionDecl * genLabelProto() const;
-        ast::FunctionDecl * genValueProto() const;
-        ast::FunctionDecl * genSuccProto() const;
-        ast::FunctionDecl * genPredProto() const;
-
-        ast::FunctionDecl * genSuccPosProto() const;
-        ast::FunctionDecl * genPredPosProto() const;
-
-        ast::FunctionDecl * genSuccPredFunc( bool succ );
-        // ast::FunctionDecl * genPredFunc();
 };
 
@@ -256 +242 @@
         enumInst.base = enumDecl;
         EnumFuncGenerator gen( enumDecl, &enumInst, functionNesting );
-        if ( enumDecl->base ) {
-                gen.genAttrFuncForward();
-                gen.genPosFunctions();
-        }
         gen.generateAndAppendFunctions( declsToAddAfter );
 }
@@ -418 +400 @@
 }
 
-/// Use the current type T to create `void ?{}(T & _dst)`.
+/// Use the current type T to create `void ^?{}(T & _dst)`.
 ast::FunctionDecl * FuncGenerator::genDtorProto() const {
         // The destructor must be mutex on a concurrent type.
@@ -777 +759 @@
 }
 
-ast::FunctionDecl * EnumFuncGenerator::genPosProto() const {
-        return genProto( "posE", 
-                { new ast::ObjectDecl( getLocation(), "_i", 
-                new ast::EnumInstType( decl ) )}, 
-                { new ast::ObjectDecl( getLocation(), "_ret", 
-                new ast::BasicType{ ast::BasicType::UnsignedInt } )} );
-}
-
-ast::FunctionDecl * EnumFuncGenerator::genLabelProto() const {
-        return genProto( "labelE",
-                { new ast::ObjectDecl( getLocation(), "_i", 
-                new ast::EnumInstType( decl ) ) },
-                { new ast::ObjectDecl( getLocation(), "_ret", 
-                new ast::PointerType( new ast::BasicType{ ast::BasicType::Char } ) ) } );
-}
-
-ast::FunctionDecl * EnumFuncGenerator::genValueProto() const {
-        return genProto( "valueE", 
-                { new ast::ObjectDecl( getLocation(), "_i", new ast::EnumInstType( decl ) )},
-                { new ast::ObjectDecl( getLocation(), "_ret", ast::deepCopy( decl->base ) ) } );
-}
-
-ast::FunctionDecl * EnumFuncGenerator::genSuccProto() const {
-        return genProto( "succ",
-                { new ast::ObjectDecl( getLocation(), "_i", new ast::EnumInstType( decl ) )},
-                { new ast::ObjectDecl( getLocation(), "_ret", new ast::EnumInstType( decl ))} ); 
-}
-
-ast::FunctionDecl * EnumFuncGenerator::genPredProto() const {
-        return genProto( "pred",
-                { new ast::ObjectDecl( getLocation(), "_i", new ast::EnumInstType( decl ))},
-                { new ast::ObjectDecl( getLocation(), "_ret", new ast::EnumInstType( decl ))} );
-}
-
-ast::FunctionDecl * EnumFuncGenerator::genSuccPosProto() const {
-        return genProto( "_successor_",
-                { new ast::ObjectDecl( getLocation(), "_i", 
-                        new ast::EnumPosType( new ast::EnumInstType( decl ) ) )},
-                { 
-                        new ast::ObjectDecl( getLocation(), "_ret", 
-                        new ast::EnumPosType( new ast::EnumInstType( decl ) ) )
-                } ); 
-}
-
-ast::FunctionDecl * EnumFuncGenerator::genPredPosProto() const {
-        return genProto( "_predessor_",
-                { new ast::ObjectDecl( getLocation(), "_i", 
-                        new ast::EnumPosType( new ast::EnumInstType( decl ) ) )},
-                { 
-                        new ast::ObjectDecl( getLocation(), "_ret", 
-                        new ast::EnumPosType( new ast::EnumInstType( decl ) ) )
-                } ); 
-}
-
-ast::FunctionDecl * EnumFuncGenerator::genSuccPredFunc( bool succ ) {
-        ast::FunctionDecl * decl = succ? genSuccPosProto(): genPredPosProto();
-        produceForwardDecl( decl );
-
-        const CodeLocation& location = getLocation();
-
-        auto & params = decl->params;
-        assert( params.size() == 1 );
-        auto param = params.front().strict_as<ast::ObjectDecl>();
-
-        auto newReturn = new ast::ObjectDecl( location, "_returns",
-                new ast::BasicType{ ast::BasicType::SignedInt} );
-        
-
-        ast::UntypedExpr * addOneExpr = new ast::UntypedExpr( location,
-                new ast::NameExpr( location, succ? "?+?": "?-?" )
-        );
-        addOneExpr->args.push_back( 
-                new ast::CastExpr( location, 
-                        new ast::VariableExpr( location, param ),
-                        new ast::BasicType{ ast::BasicType::SignedInt }
-                )
-        );
-        addOneExpr->args.push_back( 
-                ast::ConstantExpr::from_int( location, 1 )
-        );
-
-        ast::UntypedExpr * assignExpr = new ast::UntypedExpr( location,
-                new ast::NameExpr( location, "?=?" )
-        );
-        assignExpr->args.push_back(     
-                new ast::VariableExpr( location, newReturn )
-        );
-        assignExpr->args.push_back(
-                addOneExpr
-        );
-
-        decl->stmts = new ast::CompoundStmt( location, 
-                {
-                        new ast::DeclStmt( location, newReturn ),
-                        new ast::ExprStmt( location, assignExpr ),
-                        new ast::ReturnStmt( location, 
-                                new ast::VariableExpr( location, newReturn )) 
-                } );
-        
-        return decl;
-}
-
-void EnumFuncGenerator::genAttrFuncForward() {  
-        if ( decl->base ) {
-                ast::FunctionDecl *(EnumFuncGenerator::*attrProtos[5])() const = {
-                        &EnumFuncGenerator::genPosProto, &EnumFuncGenerator::genLabelProto, 
-                        &EnumFuncGenerator::genValueProto, &EnumFuncGenerator::genSuccProto,
-                        &EnumFuncGenerator::genPredProto
-                        // ,&EnumFuncGenerator::genSuccPosProto,
-                        // &EnumFuncGenerator::genPredPosProto
-                };
-                for ( auto & generator : attrProtos ) {
-                        produceForwardDecl( (this->*generator)() );
-                }
-        }
-}
-
-void EnumFuncGenerator::genPosFunctions() {
-        if ( decl->base ) {
-                ast::FunctionDecl * succ = genSuccPredFunc( true );
-                ast::FunctionDecl * pred = genSuccPredFunc( false );
-                produceDecl( succ );
-                produceDecl( pred );
-        }
-
-}
-
 void TypeFuncGenerator::genFieldCtors() {
         // Opaque types do not have field constructors.