Changeset a085470 for src/Parser/StatementNode.cc

Timestamp:

Apr 10, 2023, 12:03:31 PM (3 years ago)

Author:

Mike Brooks <mlbrooks@…>

Branches:

ADT, ast-experimental, master

Children:

6adeb5f

Parents:

2b01f8e (diff), ea2759b (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

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
@@ -23 +25 @@
 #include "Common/SemanticError.h"  // for SemanticError
 #include "Common/utility.h"        // for maybeMoveBuild, maybeBuild
-#include "ParseNode.h"             // for StatementNode, ExpressionNode, bui...
+#include "DeclarationNode.h"       // for DeclarationNode
+#include "ExpressionNode.h"        // for ExpressionNode
 #include "parserutility.h"         // for notZeroExpr
 
@@ -52 +55 @@
         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 ) {
@@ -218 +234 @@
                 astelse.empty() ? nullptr : astelse.front().release(),
                 std::move( astinit ),
-                false
+                ast::While
         );
 } // build_while
@@ -237 +253 @@
                 astelse.empty() ? nullptr : astelse.front().release(),
                 {},
-                true
+                ast::DoWhile
         );
 } // build_do_while
@@ -362 +378 @@
 } // build_finally
 
-ast::SuspendStmt * build_suspend( const CodeLocation & location, StatementNode * then, ast::SuspendStmt::Type type ) {
+ast::SuspendStmt * build_suspend( const CodeLocation & location, StatementNode * then, ast::SuspendStmt::Kind kind ) {
         std::vector<ast::ptr<ast::Stmt>> stmts;
         buildMoveList( then, stmts );
@@ -370 +386 @@
                 then2 = stmts.front().strict_as<ast::CompoundStmt>();
         }
-        auto node = new ast::SuspendStmt( location, then2, ast::SuspendStmt::None );
-        node->type = type;
-        return node;
+        return new ast::SuspendStmt( location, then2, kind );
 } // build_suspend