Changeset 29702ad for src/Validate/EnumAndPointerDecay.cpp

Timestamp:

Nov 22, 2022, 10:18:04 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

20cf96d

Parents:

1553a55 (diff), d41735a (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/Validate/EnumAndPointerDecay.cpp (modified) (1 diff)

src/Validate/EnumAndPointerDecay.cpp

@@ -41 +41 @@
         auto mut = ast::mutate( decl );
         std::vector<ast::ptr<ast::Decl>> buffer;
-        for ( auto it = decl->members.begin(); it != decl->members.end(); ++it ) {
-                if ( ast::ObjectDecl const * object = (*it).as<ast::ObjectDecl>() ) {
-                        buffer.push_back( ast::mutate_field( object, &ast::ObjectDecl::type, new ast::EnumInstType( decl, ast::CV::Const ) ) );
-                } else if ( ast::InlineValueDecl const * value = (*it).as<ast::InlineValueDecl>() ) {
+        for ( auto member : decl->members ) {
+                if ( ast::ObjectDecl const * object = member.as<ast::ObjectDecl>() ) {
+                        buffer.push_back( ast::mutate_field( object,
+                                &ast::ObjectDecl::type,
+                                new ast::EnumInstType( decl, ast::CV::Const ) ) );
+                } else if ( auto value = member.as<ast::InlineMemberDecl>() ) {
                         if ( auto targetEnum = symtab.lookupEnum( value->name ) ) {
-                                for ( auto singleMember : targetEnum->members ) {
-                                        auto copyingMember = singleMember.as<ast::ObjectDecl>();
+                                for ( auto enumMember : targetEnum->members ) {
+                                        auto enumObject = enumMember.strict_as<ast::ObjectDecl>();
                                         buffer.push_back( new ast::ObjectDecl(
-                                                value->location, // use the "inline" location
-                                                copyingMember->name,
+                                                // Get the location from the "inline" declaration.
+                                                value->location,
+                                                enumObject->name,
+                                                // Construct a new EnumInstType as the type.
                                                 new ast::EnumInstType( decl, ast::CV::Const ),
-                                                // Construct a new EnumInstType as the type
-                                                copyingMember->init,
-                                                copyingMember->storage,
-                                                copyingMember->linkage,
-                                                copyingMember->bitfieldWidth,
+                                                enumObject->init,
+                                                enumObject->storage,
+                                                enumObject->linkage,
+                                                enumObject->bitfieldWidth,
                                                 {},
-                                                copyingMember->funcSpec
+                                                enumObject->funcSpec
                                         ) );
                                 }