Changeset 6cebfef for src/AST

Timestamp:

Aug 13, 2021, 3:58:19 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

de52331

Parents:

c9f9d4f

Message:

added mutex stmt monitor

Location:

src/AST

Files:

• Convert.cpp (modified) (2 diffs)
• Fwd.hpp (modified) (1 diff)
• Node.cpp (modified) (1 diff)
• Pass.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (1 diff)
• Print.cpp (modified) (1 diff)
• Stmt.hpp (modified) (1 diff)
• Visitor.hpp (modified) (1 diff)

src/AST/Convert.cpp

@@ -606 +606 @@
         }
 
+        const ast::Stmt * visit( const ast::MutexStmt * node ) override final {
+                if ( inCache( node ) ) return nullptr;
+                 auto stmt = new MutexStmt(
+                        get<Statement>().accept1( node->stmt ),
+                        get<Expression>().acceptL( node->mutexObjs )
+                );
+                return stmtPostamble( stmt, node );
+        }
+
         TypeSubstitution * convertTypeSubstitution(const ast::TypeSubstitution * src) {
 
@@ -2124 +2133 @@
         }
 
+        virtual void visit( const MutexStmt * old ) override final {
+                if ( inCache( old ) ) return;
+                this->node = new ast::MutexStmt(
+                        old->location,
+                        GET_ACCEPT_1(stmt, Stmt),
+                        GET_ACCEPT_V(mutexObjs, Expr)
+                );
+                cache.emplace( old, this->node );
+        }
+
         // TypeSubstitution shouldn't exist yet in old.
         ast::TypeSubstitution * convertTypeSubstitution(const TypeSubstitution * old) {

src/AST/Fwd.hpp

@@ -60 +60 @@
 class NullStmt;
 class ImplicitCtorDtorStmt;
+class MutexStmt;
 
 class Expr;

src/AST/Node.cpp

@@ -176 +176 @@
 template class ast::ptr_base< ast::ImplicitCtorDtorStmt, ast::Node::ref_type::weak >;
 template class ast::ptr_base< ast::ImplicitCtorDtorStmt, ast::Node::ref_type::strong >;
+template class ast::ptr_base< ast::MutexStmt, ast::Node::ref_type::weak >;
+template class ast::ptr_base< ast::MutexStmt, ast::Node::ref_type::strong >;
 template class ast::ptr_base< ast::Expr, ast::Node::ref_type::weak >;
 template class ast::ptr_base< ast::Expr, ast::Node::ref_type::strong >;

src/AST/Pass.hpp

@@ -162 +162 @@
         const ast::Stmt *             visit( const ast::DeclStmt             * ) override final;
         const ast::Stmt *             visit( const ast::ImplicitCtorDtorStmt * ) override final;
+        const ast::Stmt *             visit( const ast::MutexStmt            * ) override final;
         const ast::Expr *             visit( const ast::ApplicationExpr      * ) override final;
         const ast::Expr *             visit( const ast::UntypedExpr          * ) override final;

src/AST/Pass.impl.hpp

@@ -1039 +1039 @@
 
 //--------------------------------------------------------------------------
+// MutexStmt
+template< typename core_t >
+const ast::Stmt * ast::Pass< core_t >::visit( const ast::MutexStmt * node ) {
+        VISIT_START( node );
+
+        VISIT({
+                // mutex statements introduce a level of scope (for the initialization)
+                guard_symtab guard { *this };
+                maybe_accept( node, &MutexStmt::stmt );
+                maybe_accept( node, &MutexStmt::mutexObjs );
+        })
+
+        VISIT_END( Stmt, node );
+}
+
+//--------------------------------------------------------------------------
 // ApplicationExpr
 template< typename core_t >

src/AST/Print.cpp

@@ -794 +794 @@
                 ++indent;
                 safe_print( node->callStmt );
+                --indent;
+                os << endl;
+
+                return node;
+        }
+
+        virtual const ast::Stmt * visit( const ast::MutexStmt * node ) override final {
+                os << "Mutex Statement" << endl;
+                os << indent << "... with Mutex Parameters: ";
+                ++indent;
+                printAll( node->mutexObjs );
+                --indent;
+                os << indent << "... with Statement: ";
+                ++indent;
+                safe_print( node->stmt );
                 --indent;
                 os << endl;

src/AST/Stmt.hpp

@@ -426 +426 @@
 };
 
+/// Mutex Statement
+class MutexStmt final : public Stmt {
+public:
+        ptr<Stmt> stmt;
+        std::vector<ptr<Expr>> mutexObjs;
+
+        MutexStmt( const CodeLocation & loc, const Stmt * stmt, 
+                std::vector<ptr<Expr>> && mutexes, std::vector<Label> && labels = {} )
+        : Stmt(loc, std::move(labels)), stmt(stmt), mutexObjs(std::move(mutexes)) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
+        MutexStmt * clone() const override { return new MutexStmt{ *this }; }
+        MUTATE_FRIEND
+};
+
 }
 

src/AST/Visitor.hpp

@@ -54 +54 @@
     virtual const ast::Stmt *             visit( const ast::DeclStmt             * ) = 0;
     virtual const ast::Stmt *             visit( const ast::ImplicitCtorDtorStmt * ) = 0;
+    virtual const ast::Stmt *             visit( const ast::MutexStmt            * ) = 0;
     virtual const ast::Expr *             visit( const ast::ApplicationExpr      * ) = 0;
     virtual const ast::Expr *             visit( const ast::UntypedExpr          * ) = 0;