Changes in src/InitTweak/GenInit.cpp [90e683b:e6491ca]

File:

• src/InitTweak/GenInit.cpp (modified) (1 diff)

src/InitTweak/GenInit.cpp

@@ -164 +164 @@
                                 ast::ObjectDecl * arrayDimension = nullptr;
 
-                                if ( auto ty = dynamic_cast< const ast::TypeExpr * >( arrayType->dimension.get() ) ) {
+                                const ast::TypeExpr * ty = dynamic_cast< const ast::TypeExpr * >( arrayType->dimension.get() );
+                                if ( ty ) {
                                         auto inst = ty->type.as<ast::EnumInstType>();
-                                        if ( inst && !inst->base->is_c_enum() ) {
-                                                arrayDimension = new ast::ObjectDecl(
-                                                        arrayType->dimension->location,
-                                                        dimensionName.newName(),
-                                                        new ast::BasicType( ast::BasicKind::UnsignedChar ),
-                                                        new ast::SingleInit(
+                                        if ( inst ) {
+                                                if ( inst->base->isCfa ) {
+                                                        arrayDimension = new ast::ObjectDecl(
                                                                 arrayType->dimension->location,
-                                                                ast::ConstantExpr::from_int( arrayType->dimension->location, inst->base->members.size() )
-                                                        )
-                                                );
+                                                                dimensionName.newName(),
+                                                                new ast::BasicType( ast::BasicKind::UnsignedChar ),
+                                                                new ast::SingleInit(
+                                                                        arrayType->dimension->location,
+                                                                        ast::ConstantExpr::from_int( arrayType->dimension->location, inst->base->members.size() )
+                                                                )
+                                                        );
+                                                        // return arrayType;
+                                                }
                                         }
                                 }