Changeset 90be0cf for src/Validate

Timestamp:

Oct 24, 2024, 12:50:14 PM (3 weeks ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

d031f7f

Parents:

12c4a5f

Message:

Moved some methods out of EnumDecl?. These were calculations and the ast types are supposed to be data focused so they should either go with utility functions or to their use site. I tried the use site.

File:

• src/Validate/ImplementEnumFunc.cpp (modified) (5 diffs)

src/Validate/ImplementEnumFunc.cpp

@@ -78 +78 @@
         std::vector<ast::ptr<ast::Init>> genValueInit() const;
         ast::ObjectDecl* genAttrArrayProto(
-                const ast::EnumAttribute attr, const CodeLocation& location,
-                std::vector<ast::ptr<ast::Init>>& inits) const;
+                const CodeLocation& location, const std::string& prefix,
+                const ast::Type * type, std::vector<ast::ptr<ast::Init>>& inits ) const;
 };
 
@@ -351 +351 @@
 
 ast::ObjectDecl* EnumAttrFuncGenerator::genAttrArrayProto(
-        const ast::EnumAttribute attr, const CodeLocation& location,
-        std::vector<ast::ptr<ast::Init>>& inits) const {
+                const CodeLocation& location, const std::string& prefix,
+                const ast::Type * type, std::vector<ast::ptr<ast::Init>>& inits ) const {
         ast::ArrayType* arrT = new ast::ArrayType(
-                attr == ast::EnumAttribute::Value
-                        ? decl->base
-                        : new ast::PointerType(
-                                new ast::BasicType(ast::BasicKind::Char, ast::CV::Const)),
+                type,
                 ast::ConstantExpr::from_int(decl->location, decl->members.size()),
                 ast::LengthFlag::FixedLen, ast::DimensionFlag::DynamicDim);
@@ -363 +360 @@
         ast::ObjectDecl* objDecl =
                 new ast::ObjectDecl(
-                        decl->location, decl->getUnmangeldArrayName( attr ),
+                        decl->location, prefix + decl->name,
                         arrT, new ast::ListInit( location, std::move( inits ) ),
                         ast::Storage::Static, ast::Linkage::AutoGen );
@@ -417 +414 @@
 void EnumAttrFuncGenerator::genTypedEnumFunction(const ast::EnumAttribute attr) {
         if (attr == ast::EnumAttribute::Value) {
-                if (decl->isTyped()) {
-                        // TypedEnum's backing arrays
-                        std::vector<ast::ptr<ast::Init>> inits = genValueInit();
-                        ast::ObjectDecl* arrayProto =
-                                genAttrArrayProto(attr, getLocation(), inits);
-                        forwards.push_back(arrayProto);
-
-                        ast::FunctionDecl* funcProto = genValueProto();
-                        produceForwardDecl(funcProto);
-                        genValueOrLabelBody(funcProto, arrayProto);
-                        produceDecl(funcProto);
-                }  
-                // else {
-                //      ast::FunctionDecl* funcProto = genQuasiValueProto();
-                //      produceForwardDecl(funcProto);
-                //      // genQuasiValueBody(funcProto);
-                //      produceDecl(funcProto);
-                // }
+                if ( !decl->isTyped() ) return;
+                std::vector<ast::ptr<ast::Init>> inits = genValueInit();
+                ast::ObjectDecl* arrayProto =
+                        genAttrArrayProto( getLocation(), "values_", decl->base, inits );
+                forwards.push_back(arrayProto);
+
+                ast::FunctionDecl* funcProto = genValueProto();
+                produceForwardDecl(funcProto);
+                genValueOrLabelBody(funcProto, arrayProto);
+                produceDecl(funcProto);
         } else if (attr == ast::EnumAttribute::Label) {
                 std::vector<ast::ptr<ast::Init>> inits = genLabelInit();
+                const ast::Type * type = new ast::PointerType(
+                        new ast::BasicType( ast::BasicKind::Char, ast::CV::Const ) );
                 ast::ObjectDecl* arrayProto =
-                        genAttrArrayProto(attr, getLocation(), inits);
+                        genAttrArrayProto( getLocation(), "labels_", type, inits );
                 forwards.push_back(arrayProto);
                 ast::FunctionDecl* funcProto = genLabelProto();
@@ -445 +436 @@
                 produceDecl(funcProto);
         } else {
+                assert( attr == ast::EnumAttribute::Posn );
                 ast::FunctionDecl* funcProto = genPosnProto();
                 produceForwardDecl(funcProto);