Changeset 29702ad for src/AST

Timestamp:

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

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, stuck-waitfor-destruct

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

Location:

src/AST

Files:

• Convert.cpp (modified) (4 diffs)
• Decl.hpp (modified) (4 diffs)
• Fwd.hpp (modified) (1 diff)
• Pass.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (2 diffs)
• Print.cpp (modified) (1 diff)
• Visitor.hpp (modified) (1 diff)

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,

src/AST/Decl.hpp

@@ -315 +315 @@
         // enum (type_optional) Name {...} 
         ptr<Type> base; // if isTyped == true && base.get() == nullptr, it is a "void" type enum
-
-        EnumDecl( const CodeLocation& loc, const std::string& name, bool isTyped = false, 
+        enum class EnumHiding { Visible, Hide } hide;
+
+        EnumDecl( const CodeLocation& loc, const std::string& name, bool isTyped = false,
                 std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall,
-                Type const * base = nullptr,
+                Type const * base = nullptr, EnumHiding hide = EnumHiding::Hide,
                 std::unordered_map< std::string, long long > enumValues = std::unordered_map< std::string, long long >() )
-        : AggregateDecl( loc, name, std::move(attrs), linkage ), isTyped(isTyped), base(base), enumValues(enumValues) {}
+        : AggregateDecl( loc, name, std::move(attrs), linkage ), isTyped(isTyped), base(base), hide(hide), enumValues(enumValues) {}
 
         /// gets the integer value for this enumerator, returning true iff value found
@@ -397 +398 @@
 };
 
+/// Static Assertion `_Static_assert( ... , ... );`
 class StaticAssertDecl : public Decl {
 public:
@@ -411 +413 @@
 };
 
-class InlineValueDecl final : public DeclWithType {
+/// Inline Member Declaration `inline TypeName;`
+class InlineMemberDecl final : public DeclWithType {
 public:
         ptr<Type> type;
 
-        InlineValueDecl( const CodeLocation & loc, const std::string & name, const Type * type,
+        InlineMemberDecl( const CodeLocation & loc, const std::string & name, const Type * type,
                 Storage::Classes storage = {}, Linkage::Spec linkage = Linkage::Cforall,
                 std::vector< ptr<Attribute> > && attrs = {}, Function::Specs fs = {} )
@@ -425 +428 @@
         const DeclWithType * accept( Visitor& v ) const override { return v.visit( this ); }
 private:
-        InlineValueDecl * clone() const override { return new InlineValueDecl{ *this }; }
-        MUTATE_FRIEND
-};
+        InlineMemberDecl * clone() const override { return new InlineMemberDecl{ *this }; }
+        MUTATE_FRIEND
+};
+
 }
 

src/AST/Fwd.hpp

@@ -37 +37 @@
 class DirectiveDecl;
 class StaticAssertDecl;
-class InlineValueDecl;
+class InlineMemberDecl;
 
 class Stmt;

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::InlineValueDecl      * ) 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

@@ -686 +686 @@
 
         if ( __visit_children() ) {
-                // unlike structs, traits, and unions, enums inject their members into the global scope
-                maybe_accept( node, &EnumDecl::base );
-                maybe_accept( node, &EnumDecl::params     );
-                maybe_accept( node, &EnumDecl::members    );
-                maybe_accept( node, &EnumDecl::attributes );
+                if ( node->hide == ast::EnumDecl::EnumHiding::Hide ) {
+                        guard_symtab guard { *this };
+                        maybe_accept( node, &EnumDecl::base );
+                        maybe_accept( node, &EnumDecl::params     );
+                        maybe_accept( node, &EnumDecl::members    );
+                        maybe_accept( node, &EnumDecl::attributes );
+                } else {
+                        maybe_accept( node, &EnumDecl::base );
+                        maybe_accept( node, &EnumDecl::params     );
+                        maybe_accept( node, &EnumDecl::members    );
+                        maybe_accept( node, &EnumDecl::attributes );
+                }
         }
 
@@ -803 +810 @@
 
 //--------------------------------------------------------------------------
-// DeclWithType
-template< typename core_t >
-const ast::DeclWithType * ast::Pass< core_t >::visit( const ast::InlineValueDecl * node ) {
-        VISIT_START( node );
-
-        if ( __visit_children() ) {
-                {
-                        guard_symtab guard { *this };
-                        maybe_accept( node, &InlineValueDecl::type );
+// InlineMemberDecl
+template< typename core_t >
+const ast::DeclWithType * ast::Pass< core_t >::visit( const ast::InlineMemberDecl * node ) {
+        VISIT_START( node );
+
+        if ( __visit_children() ) {
+                {
+                        guard_symtab guard { *this };
+                        maybe_accept( node, &InlineMemberDecl::type );
                 }
         }

src/AST/Print.cpp

@@ -401 +401 @@
         }
 
-        virtual const ast::DeclWithType * visit( const ast::InlineValueDecl * node ) override final {
+        virtual const ast::DeclWithType * visit( const ast::InlineMemberDecl * node ) override final {
                 os << "inline ";
                 if ( ! node->name.empty() ) os << node->name;

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::InlineValueDecl      * ) = 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;