Changeset 427854b for src/Parser

Timestamp:

Mar 2, 2020, 4:59:27 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

dfa4360

Parents:

37cdd97

Message:

First draft implementation of generators, still missing error checking, testing and clean-up

Location:

src/Parser

Files:

• ParseNode.h (modified) (1 diff)
• StatementNode.cc (modified) (1 diff)
• TypeData.cc (modified) (1 diff)
• parser.yy (modified) (2 diffs)

src/Parser/ParseNode.h

@@ -428 +428 @@
 Statement * build_asm( bool voltile, Expression * instruction, ExpressionNode * output = nullptr, ExpressionNode * input = nullptr, ExpressionNode * clobber = nullptr, LabelNode * gotolabels = nullptr );
 Statement * build_directive( std::string * directive );
+SuspendStmt * build_suspend( StatementNode *, SuspendStmt::Type = SuspendStmt::None);
 WaitForStmt * build_waitfor( ExpressionNode * target, StatementNode * stmt, ExpressionNode * when );
 WaitForStmt * build_waitfor( ExpressionNode * target, StatementNode * stmt, ExpressionNode * when, WaitForStmt * existing );

src/Parser/StatementNode.cc

@@ -249 +249 @@
 } // build_finally
 
+SuspendStmt * build_suspend( StatementNode * then, SuspendStmt::Type type ) {
+        auto node = new SuspendStmt();
+
+        node->type = type;
+
+        std::list< Statement * > stmts;
+        buildMoveList< Statement, StatementNode >( then, stmts );
+        if(!stmts.empty()) {
+                assert( stmts.size() == 1 );
+                node->then = dynamic_cast< CompoundStmt * >( stmts.front() );
+        }
+
+        return node;
+}
+
 WaitForStmt * build_waitfor( ExpressionNode * targetExpr, StatementNode * stmt, ExpressionNode * when ) {
         auto node = new WaitForStmt();

src/Parser/TypeData.cc

@@ -769 +769 @@
           case AggregateDecl::Struct:
           case AggregateDecl::Coroutine:
+          case AggregateDecl::Generator:
           case AggregateDecl::Monitor:
           case AggregateDecl::Thread:

src/Parser/parser.yy

@@ -1261 +1261 @@
                 { SemanticError( yylloc, "Initializer return is currently unimplemented." ); $$ = nullptr; }
         | SUSPEND ';'
-                { SemanticError( yylloc, "Suspend expression is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_suspend( nullptr ) ); }
         | SUSPEND compound_statement ';'
-                { SemanticError( yylloc, "Suspend expression is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_suspend( $2 ) ); }
         | SUSPEND COROUTINE ';'
-                { SemanticError( yylloc, "Suspend expression is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_suspend( nullptr, SuspendStmt::Coroutine ) ); }
         | SUSPEND COROUTINE compound_statement
-                { SemanticError( yylloc, "Suspend expression is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_suspend( $3, SuspendStmt::Coroutine ) ); }
         | SUSPEND GENERATOR ';'
-                { SemanticError( yylloc, "Suspend expression is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_suspend( nullptr, SuspendStmt::Generator ) ); }
         | SUSPEND GENERATOR compound_statement
-                { SemanticError( yylloc, "Suspend expression is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_suspend( $3, SuspendStmt::Generator ) ); }
         | THROW assignment_expression_opt ';'                           // handles rethrow
                 { $$ = new StatementNode( build_throw( $2 ) ); }
@@ -2086 +2086 @@
 aggregate_control:                                                                              // CFA
         GENERATOR
-                { SemanticError( yylloc, "generator is currently unimplemented." ); $$ = AggregateDecl::NoAggregate; }
+                { yyy = true; $$ = AggregateDecl::Generator; }
         | MONITOR GENERATOR
                 { SemanticError( yylloc, "monitor generator is currently unimplemented." ); $$ = AggregateDecl::NoAggregate; }