Changeset 63be3387 for src/AST/Convert.cpp

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (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/AST/Convert.cpp (modified) (3 diffs)

src/AST/Convert.cpp

@@ -234 +234 @@
                 }
                 return declWithTypePostamble( decl, node );
+        }
+
+        // InlineMemberDecl vanish after EnumAndPointerDecay pass so no necessary to implement NewToOld
+        const ast::DeclWithType * visit( const ast::InlineMemberDecl * node ) override final {  
+                assert( false );
+                (void) node;
+                return nullptr;
         }
 
@@ -1614 +1621 @@
                         { old->get_funcSpec().val }
                 );
-                decl->enumInLine = old->enumInLine;
                 cache.emplace(old, decl);
                 assert(cache.find( old ) != cache.end());
@@ -1859 +1865 @@
                 decl->uniqueId   = old->uniqueId;
                 decl->storage    = { old->storageClasses.val };
+
+                this->node = decl;
+        }
+
+        virtual void visit( const InlineMemberDecl * old ) override final {
+                if ( inCache( old ) ) {
+                        return;
+                }
+                auto&& type = GET_ACCEPT_1(type, Type);
+                auto&& attr = GET_ACCEPT_V(attributes, Attribute);
+
+                auto decl = new ast::InlineMemberDecl(
+                        old->location,
+                        old->name,
+                        type,
+                        { old->get_storageClasses().val },
+                        { old->linkage.val },
+                        std::move(attr),
+                        { old->get_funcSpec().val }
+                );
+                cache.emplace(old, decl);
+                assert(cache.find( old ) != cache.end());
+                decl->scopeLevel = old->scopeLevel;
+                decl->mangleName = old->mangleName;
+                decl->isDeleted  = old->isDeleted;
+                decl->asmName    = GET_ACCEPT_1(asmName, Expr);
+                decl->uniqueId   = old->uniqueId;
+                decl->extension  = old->extension;
 
                 this->node = decl;