Changeset 29702ad for src/AST/Convert.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/AST/Convert.cpp (modified) (4 diffs)

src/AST/Convert.cpp

@@ -236 +236 @@
         }
 
-        // InlineValueDecl vanish after EnumAndPointerDecay pass so no necessary to implement NewToOld
-        const ast::DeclWithType * visit( const ast::InlineValueDecl * node ) override final {   
+        // 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;
@@ -1764 +1764 @@
                         { old->linkage.val },
                         GET_ACCEPT_1(base, Type),
+                        old->hide == EnumDecl::EnumHiding::Hide ? ast::EnumDecl::EnumHiding::Hide : ast::EnumDecl::EnumHiding::Visible,
                         old->enumValues
                 );
@@ -1869 +1870 @@
         }
 
-        virtual void visit( const InlineValueDecl * old ) override final {
+        virtual void visit( const InlineMemberDecl * old ) override final {
                 if ( inCache( old ) ) {
                         return;
@@ -1875 +1876 @@
                 auto&& type = GET_ACCEPT_1(type, Type);
                 auto&& attr = GET_ACCEPT_V(attributes, Attribute);
- 
-                auto decl = new ast::InlineValueDecl(
+
+                auto decl = new ast::InlineMemberDecl(
                         old->location,
                         old->name,