Changeset 1931bb01 for src/AST

Timestamp:

Jul 12, 2022, 3:21:18 PM (22 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

b9f8274

Parents:

9c6443e

Message:

Converted 'Validate A' to the new AST. There some utility changes as well.

Location:

src/AST

Files:

• Convert.cpp (modified) (3 diffs)
• Decl.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -168 +168 @@
                 auto attr = get<Attribute>().acceptL( node->attributes );
 
+                // This field can be unset very early on (Pre-FixReturnTypes).
+                auto newType = (type) ? type->clone() : nullptr;
+
                 auto decl = new ObjectDecl(
                         node->name,
@@ -173 +176 @@
                         LinkageSpec::Spec( node->linkage.val ),
                         bfwd,
-                        type->clone(),
+                        newType,
                         nullptr, // prevent infinite loop
                         attr,
@@ -1579 +1582 @@
 
         virtual void visit( const ObjectDecl * old ) override final {
+                if ( inCache( old ) ) {
+                        return;
+                }
                 auto&& type = GET_ACCEPT_1(type, Type);
                 auto&& init = GET_ACCEPT_1(init, Init);
                 auto&& bfwd = GET_ACCEPT_1(bitfieldWidth, Expr);
                 auto&& attr = GET_ACCEPT_V(attributes, Attribute);
-                if ( inCache( old ) ) {
-                        return;
-                }
+
                 auto decl = new ast::ObjectDecl(
                         old->location,

src/AST/Decl.hpp

@@ -315 +315 @@
 
         EnumDecl( const CodeLocation& loc, const std::string& name,
-                std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall, Type * base = nullptr,
+                std::vector<ptr<Attribute>>&& attrs = {}, Linkage::Spec linkage = Linkage::Cforall, Type const * base = nullptr,
                 std::unordered_map< std::string, long long > enumValues = std::unordered_map< std::string, long long >() )
         : AggregateDecl( loc, name, std::move(attrs), linkage ), base(base), enumValues(enumValues) {}