Changeset 19a8c40

Timestamp:

Nov 14, 2022, 11:47:23 AM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master

Children:

63be3387, c1fb3903

Parents:

7491f97

Message:

Some clean-up I had stashed from before I knew the InlineMemberDecl? clean-up was underway.

Location:

src

Files:

• AST/Convert.cpp (modified) (1 diff)
• AST/Decl.hpp (modified) (3 diffs)
• AST/Pass.hpp (modified) (1 diff)
• AST/Pass.impl.hpp (modified) (1 diff)
• AST/Visitor.hpp (modified) (1 diff)
• Validate/EnumAndPointerDecay.cpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -1875 +1875 @@
                 auto&& type = GET_ACCEPT_1(type, Type);
                 auto&& attr = GET_ACCEPT_V(attributes, Attribute);
- 
+
                 auto decl = new ast::InlineMemberDecl(
                         old->location,

src/AST/Decl.hpp

@@ -397 +397 @@
 };
 
+/// Static Assertion `_Static_assert( ... , ... );`
 class StaticAssertDecl : public Decl {
 public:
@@ -411 +412 @@
 };
 
+/// Inline Member Declaration `inline TypeName;`
 class InlineMemberDecl final : public DeclWithType {
 public:
@@ -428 +430 @@
         MUTATE_FRIEND
 };
+
 }
 

src/AST/Pass.hpp

@@ -141 +141 @@
         const ast::DirectiveDecl *    visit( const ast::DirectiveDecl        * ) override final;
         const ast::StaticAssertDecl * visit( const ast::StaticAssertDecl     * ) override final;
-        const ast::DeclWithType *     visit( const ast::InlineMemberDecl      * ) override final;
+        const ast::DeclWithType *     visit( const ast::InlineMemberDecl     * ) override final;
         const ast::CompoundStmt *     visit( const ast::CompoundStmt         * ) override final;
         const ast::Stmt *             visit( const ast::ExprStmt             * ) override final;

src/AST/Pass.impl.hpp

@@ -803 +803 @@
 
 //--------------------------------------------------------------------------
-// DeclWithType
+// InlineMemberDecl
 template< typename core_t >
 const ast::DeclWithType * ast::Pass< core_t >::visit( const ast::InlineMemberDecl * node ) {

src/AST/Visitor.hpp

@@ -33 +33 @@
     virtual const ast::DirectiveDecl *    visit( const ast::DirectiveDecl        * ) = 0;
     virtual const ast::StaticAssertDecl * visit( const ast::StaticAssertDecl     * ) = 0;
-    virtual const ast::DeclWithType *     visit( const ast::InlineMemberDecl      * ) = 0;
+    virtual const ast::DeclWithType *     visit( const ast::InlineMemberDecl     * ) = 0;
     virtual const ast::CompoundStmt *     visit( const ast::CompoundStmt         * ) = 0;
     virtual const ast::Stmt *             visit( const ast::ExprStmt             * ) = 0;

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::InlineMemberDecl const * value = (*it).as<ast::InlineMemberDecl>() ) {
+        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
                                         ) );
                                 }