Changeset eb779d5

Timestamp:

Oct 9, 2023, 12:55:09 PM (7 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

26dfce5

Parents:

0d49efb

Message:

Implemented corun statement

Location:

src

Files:

• AST/Convert.cpp (modified) (1 diff)
• AST/Fwd.hpp (modified) (1 diff)
• AST/Node.cpp (modified) (1 diff)
• AST/Pass.hpp (modified) (1 diff)
• AST/Pass.impl.hpp (modified) (1 diff)
• AST/Print.cpp (modified) (1 diff)
• AST/Stmt.hpp (modified) (1 diff)
• AST/Visitor.hpp (modified) (1 diff)
• Common/CodeLocationTools.cpp (modified) (1 diff)
• Concurrency/Corun.cpp (added)
• Concurrency/Corun.hpp (added)
• Concurrency/module.mk (modified) (1 diff)
• Parser/StatementNode.cc (modified) (1 diff)
• Parser/StatementNode.h (modified) (1 diff)
• Parser/parser.yy (modified) (1 diff)
• main.cc (modified) (2 diffs)

src/AST/Convert.cpp

@@ -650 +650 @@
         }
 
+    const ast::Stmt * visit( const ast::CorunStmt * node ) override final {
+        // There is no old-AST CorunStmt, so this should never be called.
+                assert( !node );
+                return nullptr;
+        }
+
         TypeSubstitution * convertTypeSubstitution(const ast::TypeSubstitution * src) {
 

src/AST/Fwd.hpp

@@ -67 +67 @@
 class ImplicitCtorDtorStmt;
 class MutexStmt;
+class CorunStmt;
 
 class Expr;

src/AST/Node.cpp

@@ -192 +192 @@
 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::CorunStmt, ast::Node::ref_type::weak >;
+template class ast::ptr_base< ast::CorunStmt, 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

@@ -171 +171 @@
         const ast::Stmt *             visit( const ast::ImplicitCtorDtorStmt * ) override final;
         const ast::Stmt *             visit( const ast::MutexStmt            * ) override final;
+    const ast::Stmt *             visit( const ast::CorunStmt            * ) 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

@@ -1121 +1121 @@
 
 //--------------------------------------------------------------------------
+// CorunStmt
+template< typename core_t >
+const ast::Stmt * ast::Pass< core_t >::visit( const ast::CorunStmt * node ) {
+        VISIT_START( node );
+
+        if ( __visit_children() ) {
+                maybe_accept( node, &CorunStmt::stmt );
+        }
+
+        VISIT_END( Stmt, node );
+}
+
+//--------------------------------------------------------------------------
 // ApplicationExpr
 template< typename core_t >

src/AST/Print.cpp

@@ -922 +922 @@
         }
 
+    virtual const ast::Stmt * visit( const ast::CorunStmt * node ) override final {
+                os << "Corun Statement" << endl;
+                os << indent << "... with Statement: ";
+                ++indent;
+                safe_print( node->stmt );
+                --indent;
+                os << endl;
+
+                return node;
+        }
+
         virtual const ast::Expr * visit( const ast::ApplicationExpr * node ) override final {
                 ++indent;

src/AST/Stmt.hpp

@@ -532 +532 @@
 };
 
+// Corun Statement
+class CorunStmt final : public Stmt {
+  public:
+        ptr<Stmt> stmt;
+
+        CorunStmt( const CodeLocation & loc, const Stmt * stmt, const std::vector<Label> && labels = {} )
+                : Stmt(loc, std::move(labels)), stmt(stmt) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+  private:
+        CorunStmt * clone() const override { return new CorunStmt{ *this }; }
+        MUTATE_FRIEND
+};
+
 } // namespace ast
 

src/AST/Visitor.hpp

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

src/Common/CodeLocationTools.cpp

@@ -137 +137 @@
     macro(ImplicitCtorDtorStmt, Stmt) \
     macro(MutexStmt, Stmt) \
+    macro(CorunStmt, Stmt) \
     macro(ApplicationExpr, Expr) \
     macro(UntypedExpr, Expr) \

src/Concurrency/module.mk

@@ -18 +18 @@
         Concurrency/Actors.cpp \
         Concurrency/Actors.hpp \
+        Concurrency/Corun.cpp \
+        Concurrency/Corun.hpp \
         Concurrency/KeywordsNew.cpp \
         Concurrency/Keywords.cc \

src/Parser/StatementNode.cc

@@ -498 +498 @@
 } // build_mutex
 
+ast::Stmt * build_corun( const CodeLocation & location, StatementNode * stmt ) {
+        ast::Stmt * body = maybeMoveBuild( stmt );
+        return new ast::CorunStmt( location, body );
+} // build_corun
+
 // Local Variables: //
 // tab-width: 4 //

src/Parser/StatementNode.h

@@ -105 +105 @@
 ast::Stmt * build_with( const CodeLocation &, ExpressionNode * exprs, StatementNode * stmt );
 ast::Stmt * build_mutex( const CodeLocation &, ExpressionNode * exprs, StatementNode * stmt );
+ast::Stmt * build_corun( const CodeLocation &, StatementNode * stmt );

src/Parser/parser.yy

@@ -1721 +1721 @@
 corun_statement:
         CORUN statement
-                { SemanticError( yylloc, "corun statement is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_corun( yylloc, $2 ) ); }
         ;
 

src/main.cc

@@ -46 +46 @@
 #include "Common/utility.h"                 // for deleteAll, filter, printAll
 #include "Concurrency/Actors.hpp"           // for implementActors
+#include "Concurrency/Corun.hpp"            // for implementCorun
 #include "Concurrency/Keywords.h"           // for implementMutex, implement...
 #include "Concurrency/Waitfor.h"            // for generateWaitfor
@@ -345 +346 @@
                 PASS( "Implement Concurrent Keywords", Concurrency::implementKeywords, transUnit );
                 PASS( "Fix Unique Ids", Validate::fixUniqueIds, transUnit );
+        PASS( "Implement Corun", Concurrency::implementCorun, transUnit );
                 PASS( "Hoist Control Declarations", ControlStruct::hoistControlDecls, transUnit );