Changeset f6e8c67 for src/Parser/StatementNode.cc

Timestamp:

Mar 6, 2024, 6:06:43 AM (23 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

647d633

Parents:

bbf2cb1 (diff), af60383 (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) (3 diffs)

src/Parser/StatementNode.cc

@@ -54 +54 @@
                 StatementNode * nextStmt = new StatementNode(
                         new ast::DeclStmt( decl->location, maybeBuild( decl ) ) );
-                set_next( nextStmt );
-                if ( decl->get_next() ) {
-                        get_next()->set_next( new StatementNode( dynamic_cast< DeclarationNode * >(decl->get_next()) ) );
-                        decl->set_next( 0 );
+                next = nextStmt;
+                if ( decl->next ) {
+                        next->next = new StatementNode( decl->next );
+                        decl->next = nullptr;
                 } // if
         } else {
-                if ( decl->get_next() ) {
-                        set_next( new StatementNode( dynamic_cast< DeclarationNode * >( decl->get_next() ) ) );
-                        decl->set_next( 0 );
+                if ( decl->next ) {
+                        next = new StatementNode( decl->next );
+                        decl->next = nullptr;
                 } // if
                 agg = decl;
@@ -87 +87 @@
         ClauseNode * prev = this;
         // find end of list and maintain previous pointer
-        for ( ClauseNode * curr = prev; curr != nullptr; curr = (ClauseNode *)curr->get_next() ) {
-                ClauseNode * node = strict_dynamic_cast< ClauseNode * >(curr);
+        for ( ClauseNode * curr = prev; curr != nullptr; curr = curr->next ) {
+                ClauseNode * node = curr;
                 assert( dynamic_cast<ast::CaseClause *>( node->clause.get() ) );
                 prev = curr;
         } // for
-        ClauseNode * node = dynamic_cast< ClauseNode * >(prev);
+        ClauseNode * node = prev;
         // convert from StatementNode list to Statement list
         std::vector<ast::ptr<ast::Stmt>> stmts;
@@ -332 +332 @@
         clause->when_cond = notZeroExpr( maybeMoveBuild( when ) );
 
-        ExpressionNode * next = dynamic_cast<ExpressionNode *>( targetExpr->get_next() );
-        targetExpr->set_next( nullptr );
+        ExpressionNode * next = targetExpr->next;
+        targetExpr->next = nullptr;
         buildMoveList( next, clause->target_args );