Changeset d191e24 for src/AST

Timestamp:

Oct 19, 2022, 5:29:12 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

bc899d6

Parents:

82ff4ed1 (diff), 058ece2 (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) (5 diffs)
• Decl.hpp (modified) (2 diffs)
• Expr.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -310 +310 @@
                         node->name,
                         get<Attribute>().acceptL( node->attributes ),
-                        false, // Temporary
+                        node->isTyped,
                         LinkageSpec::Spec( node->linkage.val ),
                         get<Type>().accept1(node->base)
                 );
-                return aggregatePostamble( decl, node ); // Node info, including members, processed in aggregatePostamble
+                return aggregatePostamble( decl, node );
         }
 
@@ -737 +737 @@
                                 node->name
                 );
-                temp->var = get<DeclarationWithType>().accept1(node->var);
                 auto expr = visitBaseExpr( node,
                         temp
@@ -1615 +1614 @@
                         { old->get_funcSpec().val }
                 );
+                decl->enumInLine = old->enumInLine;
                 cache.emplace(old, decl);
                 assert(cache.find( old ) != cache.end());
@@ -2281 +2281 @@
         }
 
-        /// xxx - type_decl should be DeclWithType in the final design
-        /// type_decl is set to EnumDecl as a temporary fix
         virtual void visit( const QualifiedNameExpr * old ) override final {
                 this->node = visitBaseExpr( old,
@@ -2288 +2286 @@
                                 old->location,
                                 GET_ACCEPT_1(type_decl, Decl),
-                                GET_ACCEPT_1(var, DeclWithType),
                                 old->name
                         )

src/AST/Decl.hpp

@@ -105 +105 @@
         ptr<Init> init;
         ptr<Expr> bitfieldWidth;
+        bool enumInLine = false; // enum inline is not a real object declaration. 
+        // It is a place holder for a set of enum value (ObjectDecl)
+        bool importValue = false; // if the value copied from somewhere else
 
         ObjectDecl( const CodeLocation & loc, const std::string & name, const Type * type,
@@ -312 +315 @@
 class EnumDecl final : public AggregateDecl {
 public:
-        bool isTyped;
-        ptr<Type> base;
+        bool isTyped; // isTyped indicated if the enum has a declaration like:
+        // 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, 

src/AST/Expr.hpp

@@ -257 +257 @@
 public:
         ptr<Decl> type_decl;
-        ptr<DeclWithType> var;
         std::string name;
 
-        QualifiedNameExpr( const CodeLocation & loc, const Decl * d, const DeclWithType * r, const std::string & n ) 
-        : Expr( loc ), type_decl( d ), var(r), name( n ) {}
+        QualifiedNameExpr( const CodeLocation & loc, const Decl * d, const std::string & n ) 
+        : Expr( loc ), type_decl( d ), name( n ) {}
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/Pass.impl.hpp

@@ -1205 +1205 @@
         if ( __visit_children() ) {
                 guard_symtab guard { *this };
-                maybe_accept( node, &QualifiedNameExpr::var );
                 maybe_accept( node, &QualifiedNameExpr::type_decl );
         }