Changeset 332e93a for src/InitTweak

Timestamp:

Feb 4, 2025, 9:18:54 PM (12 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

090b076

Parents:

985ff5f (diff), 1ee74df (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/InitTweak/GenInit.cpp

@@ -164 +164 @@
                                 ast::ObjectDecl * arrayDimension = nullptr;
 
-                                const ast::TypeExpr * ty = dynamic_cast< const ast::TypeExpr * >( arrayType->dimension.get() );
-                                if ( ty ) {
+                                if ( auto ty = dynamic_cast< const ast::TypeExpr * >( arrayType->dimension.get() ) ) {
                                         auto inst = ty->type.as<ast::EnumInstType>();
-                                        if ( inst ) {
-                                                if ( inst->base->isCfa ) {
-                                                        arrayDimension = new ast::ObjectDecl(
+                                        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(
                                                                 arrayType->dimension->location,
-                                                                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;
-                                                }
+                                                                ast::ConstantExpr::from_int( arrayType->dimension->location, inst->base->members.size() )
+                                                        )
+                                                );
                                         }
                                 }