Changeset 1a6a6f2 for src/AST/Convert.cpp

Timestamp:

Aug 19, 2021, 4:04:43 PM (4 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

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

Children:

d8f8d08

Parents:

ed4d7c1 (diff), 315e5e3 (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' into 'andrew-mmath', collecting updates.

File:

• src/AST/Convert.cpp (modified) (2 diffs)

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) {