Changes in src/Parser/StatementNode.cc [c468150:bb7422a]

File:

• src/Parser/StatementNode.cc (modified) (7 diffs)

src/Parser/StatementNode.cc

@@ -15 +15 @@
 //
 
-#include "StatementNode.h"
-
 #include <cassert>                 // for assert, strict_dynamic_cast, assertf
 #include <memory>                  // for unique_ptr
@@ -25 +23 @@
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for maybeMoveBuild, maybeBuild
-#include "DeclarationNode.h"       // for DeclarationNode
-#include "ExpressionNode.h"        // for ExpressionNode
+#include "ParseNode.h"             // for StatementNode, ExpressionNode, bui...
 #include "parserutility.h"         // for notZeroExpr
 
@@ -55 +52 @@
         stmt.reset( new ast::DeclStmt( declLocation, maybeMoveBuild( agg ) ) );
 } // StatementNode::StatementNode
-
-StatementNode * StatementNode::add_label(
-                const CodeLocation & location,
-                const std::string * name,
-                DeclarationNode * attr ) {
-        stmt->labels.emplace_back( location,
-                *name,
-                attr ? std::move( attr->attributes )
-                        : std::vector<ast::ptr<ast::Attribute>>{} );
-        delete attr;
-        delete name;
-        return this;
-}
 
 StatementNode * StatementNode::append_last_case( StatementNode * stmt ) {
@@ -234 +218 @@
                 astelse.empty() ? nullptr : astelse.front().release(),
                 std::move( astinit ),
-                ast::While
+                false
         );
 } // build_while
@@ -253 +237 @@
                 astelse.empty() ? nullptr : astelse.front().release(),
                 {},
-                ast::DoWhile
+                true
         );
 } // build_do_while
@@ -378 +362 @@
 } // build_finally
 
-ast::SuspendStmt * build_suspend( const CodeLocation & location, StatementNode * then, ast::SuspendStmt::Kind kind ) {
+ast::SuspendStmt * build_suspend( const CodeLocation & location, StatementNode * then, ast::SuspendStmt::Type type ) {
         std::vector<ast::ptr<ast::Stmt>> stmts;
         buildMoveList( then, stmts );
@@ -386 +370 @@
                 then2 = stmts.front().strict_as<ast::CompoundStmt>();
         }
-        return new ast::SuspendStmt( location, then2, kind );
+        auto node = new ast::SuspendStmt( location, then2, ast::SuspendStmt::None );
+        node->type = type;
+        return node;
 } // build_suspend