Changes in src/Validate/ImplementEnumFunc.cpp [90be0cf:63d5b9c8]

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