Changeset b8524ca for src/AST

Timestamp:

Jun 20, 2019, 6:50:42 PM (5 years ago)

Author:

Aaron Moss <a3moss@…>

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:

9af00d23

Parents:

234b1cb

Message:

new AST porting

• mostly InitTweak? autogeneration
• added some convenience methods
  • nullptr assignment for ast::ptr
  • convenience wrapper ctors for AddressExpr?, CastExpr? that draw location from first arg

Location:

src/AST

Files:

• Expr.hpp (modified) (2 diffs)
• Node.hpp (modified) (2 diffs)
• Stmt.hpp (modified) (1 diff)

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