Changeset ffec1bf for src/AST

Timestamp:

Jul 25, 2022, 2:23:28 PM (22 months ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

4c48be0, 5cf1228, def751f

Parents:

9e23b446 (diff), 1f950c3b (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) (3 diffs)
• Decl.hpp (modified) (1 diff)
• Expr.cpp (modified) (1 diff)
• Inspect.cpp (added)
• Inspect.hpp (added)
• Pass.impl.hpp (modified) (1 diff)
• module.mk (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::unordered_map< std::string, long long > enumValues = std::unordered_map< std::string, long long >() )
+                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) {}
 

src/AST/Expr.cpp

@@ -272 +272 @@
         // Adjust the length of the string for the terminator.
         const Expr * strSize = from_ulong( loc, str.size() + 1 );
-        const Type * strType = new ArrayType( charType, strSize, FixedLen, StaticDim );
+        const Type * strType = new ArrayType( charType, strSize, FixedLen, DynamicDim );
         const std::string strValue = "\"" + str + "\"";
         return new ConstantExpr( loc, strType, strValue, std::nullopt );

src/AST/Pass.impl.hpp

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

src/AST/module.mk

@@ -37 +37 @@
         AST/Init.cpp \
         AST/Init.hpp \
+        AST/Inspect.cpp \
+        AST/Inspect.hpp \
         AST/Label.hpp \
         AST/LinkageSpec.cpp \