Changeset 54dd994 for src/AST

Timestamp:

Jun 24, 2019, 10:30:47 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

84917e2

Parents:

3c6e417 (diff), 9e0a360 (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:

• Expr.hpp (modified) (2 diffs)
• Init.hpp (modified) (4 diffs)
• Node.hpp (modified) (2 diffs)
• Stmt.hpp (modified) (2 diffs)

src/AST/Expr.hpp

@@ -248 +248 @@
         AddressExpr( const CodeLocation & loc, const Expr * a );
 
+        /// Generate AddressExpr wrapping given expression at same location
+        AddressExpr( const Expr * a ) : AddressExpr( a->location, a ) {}
+
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }
 private:
@@ -281 +284 @@
         /// Cast-to-void
         CastExpr( const CodeLocation & loc, const Expr * a, GeneratedFlag g = GeneratedCast );
+
+        /// Wrap a cast expression around an existing expression (always generated)
+        CastExpr( const Expr * a, const Type * to ) : CastExpr( a->location, a, to, GeneratedCast ) {}
+
+        /// Wrap a cast-to-void expression around an existing expression (always generated)
+        CastExpr( const Expr * a ) : CastExpr( a->location, a, GeneratedCast ) {}
 
         const Expr * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/Init.hpp

@@ -55 +55 @@
         ConstructFlag maybeConstructed;
 
-        Init( const CodeLocation& loc, ConstructFlag mc ) : ParseNode( loc ), maybeConstructed( mc ) {}
+        Init( const CodeLocation & loc, ConstructFlag mc ) : ParseNode( loc ), maybeConstructed( mc ) {}
 
-        const Init * accept( Visitor& v ) const override = 0;
+        const Init * accept( Visitor & v ) const override = 0;
 private:
         Init * clone() const override = 0;
@@ -69 +69 @@
         ptr<Expr> value;
 
-        SingleInit( const CodeLocation& loc, Expr* val, ConstructFlag mc = DoConstruct )
+        SingleInit( const CodeLocation & loc, const Expr * val, ConstructFlag mc = DoConstruct )
         : Init( loc, mc ), value( val ) {}
 
@@ -87 +87 @@
         std::vector<ptr<Designation>> designations;
 
-        ListInit( const CodeLocation& loc, std::vector<ptr<Init>>&& is,
-                std::vector<ptr<Designation>>&& ds = {}, ConstructFlag mc = DoConstruct );
+        ListInit( const CodeLocation & loc, std::vector<ptr<Init>> && is,
+                std::vector<ptr<Designation>> && ds = {}, ConstructFlag mc = DoConstruct );
 
         using iterator = std::vector<ptr<Init>>::iterator;
@@ -114 +114 @@
         ptr<Init> init;
 
-        ConstructorInit( const CodeLocation& loc, Stmt* ctor, Stmt* dtor, Init* init )
+        ConstructorInit( 
+                const CodeLocation & loc, const Stmt * ctor, const Stmt * dtor, const Init * init )
         : Init( loc, DoConstruct ), ctor( ctor ), dtor( dtor ), init( init ) {}
 

src/AST/Node.hpp

@@ -17 +17 @@
 
 #include <cassert>
+#include <cstddef>     // for nullptr_t
 #include <iosfwd>
 #include <type_traits> // for remove_reference
@@ -181 +182 @@
         }
 
+        ptr_base & operator=( std::nullptr_t ) {
+                if ( node ) _dec(node);
+                node = nullptr;
+                return *this;
+        }
+
         ptr_base & operator=( const ptr_base & o ) {
                 assign(o.node);

src/AST/Stmt.hpp

@@ -61 +61 @@
         CompoundStmt( CompoundStmt&& o ) = default;
 
-        void push_back( Stmt * s ) { kids.emplace_back( s ); }
-        void push_front( Stmt * s ) { kids.emplace_front( s ); }
+        void push_back( const Stmt * s ) { kids.emplace_back( s ); }
+        void push_front( const Stmt * s ) { kids.emplace_front( s ); }
 
         const CompoundStmt * accept( Visitor & v ) const override { return v.visit( this ); }
@@ -143 +143 @@
 
         IfStmt( const CodeLocation & loc, const Expr * cond, const Stmt * thenPart,
-                Stmt * const elsePart, std::vector<ptr<Stmt>> && inits,
+                const Stmt * elsePart = nullptr, std::vector<ptr<Stmt>> && inits = {},
                 std::vector<Label> && labels = {} )
         : Stmt(loc, std::move(labels)), cond(cond), thenPart(thenPart), elsePart(elsePart),