Changeset 61255ad

Timestamp:

Nov 30, 2017, 3:58:26 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

a378ca7

Parents:

4429b04

Message:

Add WithStmt? SynTree? node

Location:

src

Files:

• Common/PassVisitor.h (modified) (2 diffs)
• Common/PassVisitor.impl.h (modified) (1 diff)
• SynTree/Mutator.cc (modified) (1 diff)
• SynTree/Mutator.h (modified) (1 diff)
• SynTree/Statement.cc (modified) (1 diff)
• SynTree/Statement.h (modified) (1 diff)
• SynTree/SynTree.h (modified) (1 diff)
• SynTree/Visitor.cc (modified) (1 diff)
• SynTree/Visitor.h (modified) (1 diff)

src/Common/PassVisitor.h

@@ -81 +81 @@
         virtual void visit( FinallyStmt * finallyStmt ) override final;
         virtual void visit( WaitForStmt * waitforStmt ) override final;
+        virtual void visit( WithStmt * withStmt ) override final;
         virtual void visit( NullStmt * nullStmt ) override final;
         virtual void visit( DeclStmt * declStmt ) override final;
@@ -172 +173 @@
         virtual Statement * mutate( FinallyStmt * finallyStmt ) override final;
         virtual Statement * mutate( WaitForStmt * waitforStmt ) override final;
+        virtual Statement * mutate( WithStmt * withStmt ) override final;
         virtual NullStmt * mutate( NullStmt * nullStmt ) override final;
         virtual Statement * mutate( DeclStmt * declStmt ) override final;

src/Common/PassVisitor.impl.h

@@ -988 +988 @@
 // NullStmt
 template< typename pass_type >
+void PassVisitor< pass_type >::visit( WithStmt * node ) {
+        VISIT_BODY( node );
+}
+
+template< typename pass_type >
+Statement * PassVisitor< pass_type >::mutate( WithStmt * node ) {
+        MUTATE_BODY( Statement, node );
+}
+
+//--------------------------------------------------------------------------
+// NullStmt
+template< typename pass_type >
 void PassVisitor< pass_type >::visit( NullStmt * node ) {
         VISIT_BODY( node );

src/SynTree/Mutator.cc

@@ -203 +203 @@
 }
 
+Statement * Mutator::mutate( WithStmt * withStmt ) {
+        mutateAll( withStmt->exprs, *this );
+        withStmt->stmt = maybeMutate( withStmt->stmt, *this );
+        return withStmt;
+}
+
 NullStmt * Mutator::mutate( NullStmt *nullStmt ) {
         return nullStmt;

src/SynTree/Mutator.h

@@ -50 +50 @@
         virtual Statement * mutate( FinallyStmt * catchStmt );
         virtual Statement * mutate( WaitForStmt * waitforStmt );
+        virtual Statement * mutate( WithStmt * withStmt );
         virtual NullStmt * mutate( NullStmt * nullStmt );
         virtual Statement * mutate( DeclStmt * declStmt );

src/SynTree/Statement.cc

@@ -455 +455 @@
 }
 
+
+WithStmt::WithStmt( const std::list< Expression * > & exprs, Statement * stmt ) : Statement( std::list<Label>() ), exprs( exprs ), stmt( stmt ) {}
+WithStmt::WithStmt( const WithStmt & other ) : Statement( other ), stmt( maybeClone( other.stmt ) ) {
+        cloneAll( other.exprs, exprs );
+}
+WithStmt::~WithStmt() {
+        deleteAll( exprs );
+        delete stmt;
+}
+
+void WithStmt::print( std::ostream & os, Indenter indent ) const {
+        os << "With statement" << endl;
+        os << indent << "... with statement:" << endl << indent+1;
+        stmt->print( os, indent+1 );
+}
+
+
 NullStmt::NullStmt( std::list<Label> labels ) : Statement( labels ) {}
 NullStmt::NullStmt() : Statement( std::list<Label>() ) {}

src/SynTree/Statement.h

@@ -432 +432 @@
 };
 
+class WithStmt : public Statement {
+public:
+        std::list< Expression * > exprs;
+        Statement * stmt;
+
+        WithStmt( const std::list< Expression * > & exprs, Statement * stmt );
+        WithStmt( const WithStmt & other );
+        virtual ~WithStmt();
+
+        virtual WithStmt * clone() const override { return new WithStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+
 
 // represents a declaration that occurs as part of a compound statement

src/SynTree/SynTree.h

@@ -55 +55 @@
 class FinallyStmt;
 class WaitForStmt;
+class WithStmt;
 class NullStmt;
 class DeclStmt;

src/SynTree/Visitor.cc

@@ -174 +174 @@
 }
 
-void Visitor::visit( __attribute__((unused)) NullStmt *nullStmt ) {
+void Visitor::visit( WithStmt * withStmt ) {
+        acceptAll( withStmt->exprs, *this );
+        maybeAccept( withStmt->stmt, *this );
+}
+
+void Visitor::visit( NullStmt * ) {
 }
 

src/SynTree/Visitor.h

@@ -52 +52 @@
         virtual void visit( FinallyStmt * finallyStmt );
         virtual void visit( WaitForStmt * waitforStmt );
+        virtual void visit( WithStmt * withStmt );
         virtual void visit( NullStmt * nullStmt );
         virtual void visit( DeclStmt * declStmt );