Changeset e4d7c1c for src/AST

Timestamp:

Nov 14, 2022, 3:07:34 PM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master

Children:

db6cdc0

Parents:

71806e0

Message:

Implement enum Hiding

Location:

src/AST

Files:

• Convert.cpp (modified) (1 diff)
• Decl.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -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
                 );

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

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 );
+                }
         }