Changeset 8a1d95af for src/SynTree

Timestamp:

Aug 14, 2021, 8:48:49 AM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, pthread-emulation, qualifiedEnum

Children:

f79ee0d

Parents:

c99a0d1 (diff), 6d63c14 (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/SynTree

Files:

• Mutator.h (modified) (1 diff)
• Statement.cc (modified) (1 diff)
• Statement.h (modified) (1 diff)
• SynTree.h (modified) (1 diff)
• Visitor.h (modified) (1 diff)

src/SynTree/Mutator.h

@@ -58 +58 @@
         virtual Statement * mutate( DeclStmt * declStmt ) = 0;
         virtual Statement * mutate( ImplicitCtorDtorStmt * impCtorDtorStmt ) = 0;
+        virtual Statement * mutate( MutexStmt * mutexStmt ) = 0;
 
         virtual Expression * mutate( ApplicationExpr * applicationExpr ) = 0;

src/SynTree/Statement.cc

@@ -565 +565 @@
 }
 
+MutexStmt::MutexStmt( Statement * stmt, std::list<Expression *> mutexObjs ) 
+        : Statement(), stmt( stmt ), mutexObjs( mutexObjs ) { }
+
+MutexStmt::MutexStmt( const MutexStmt & other ) : Statement( other ), stmt( maybeClone( other.stmt ) ) {
+        cloneAll( other.mutexObjs, mutexObjs );
+}
+
+MutexStmt::~MutexStmt() {
+        deleteAll( mutexObjs );
+        delete stmt;
+}
+
+void MutexStmt::print( std::ostream & os, Indenter indent ) const {
+        os << "Mutex Statement" << endl;
+        os << indent << "... with Expressions: " << endl;
+        for (auto * obj : mutexObjs) {
+                os << indent+1;
+                obj->print( os, indent+1);
+                os << endl;
+        }
+        os << indent << "... with Statement: " << endl << indent+1;
+        stmt->print( os, indent+1 );
+}
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/Statement.h

@@ -535 +535 @@
 };
 
+class MutexStmt : public Statement {
+  public:
+        Statement * stmt;
+        std::list<Expression *> mutexObjs; // list of mutex objects to acquire
+
+        MutexStmt( Statement * stmt, std::list<Expression *> mutexObjs );
+        MutexStmt( const MutexStmt & other );
+        virtual ~MutexStmt();
+
+        virtual MutexStmt * clone() const override { return new MutexStmt( *this ); }
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Statement * acceptMutator( Mutator & m )  override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = {} ) const override;
+};
+
 // Local Variables: //
 // tab-width: 4 //

src/SynTree/SynTree.h

@@ -62 +62 @@
 class NullStmt;
 class ImplicitCtorDtorStmt;
+class MutexStmt;
 
 class Expression;

src/SynTree/Visitor.h

@@ -92 +92 @@
         virtual void visit( ImplicitCtorDtorStmt * node ) { visit( const_cast<const ImplicitCtorDtorStmt *>(node) ); }
         virtual void visit( const ImplicitCtorDtorStmt * impCtorDtorStmt ) = 0;
+        virtual void visit( MutexStmt * node ) { visit( const_cast<const MutexStmt *>(node) ); }
+        virtual void visit( const MutexStmt * mutexStmt ) = 0;
 
         virtual void visit( ApplicationExpr * node ) { visit( const_cast<const ApplicationExpr *>(node) ); }