Changeset 400b8be for src/AST/Convert.cpp

Timestamp:

Mar 28, 2022, 10:41:45 AM (2 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum

Children:

8e819a9

Parents:

f5bace8

Message:

Added StmtClause? and converted the existing nodes that should be clauses.

File:

• src/AST/Convert.cpp (modified) (11 diffs)

src/AST/Convert.cpp

@@ -353 +353 @@
         }
 
+        void clausePostamble( Statement * stmt, const ast::StmtClause * node ) {
+                stmt->location = node->location;
+                this->node = stmt;
+        }
+
         const ast::CompoundStmt * visit( const ast::CompoundStmt * node ) override final {
                 if ( inCache( node ) ) return nullptr;
@@ -401 +406 @@
                 auto stmt = new SwitchStmt(
                         get<Expression>().accept1( node->cond ),
-                        get<Statement>().acceptL( node->stmts )
+                        get<Statement>().acceptL( node->cases )
                 );
                 return stmtPostamble( stmt, node );
         }
 
-        const ast::Stmt * visit( const ast::CaseStmt * node ) override final {
+        const ast::CaseClause * visit( const ast::CaseClause * node ) override final {
                 if ( inCache( node ) ) return nullptr;
                 auto stmt = new CaseStmt(
@@ -413 +418 @@
                         node->isDefault()
                 );
-                return stmtPostamble( stmt, node );
+                clausePostamble( stmt, node );
+                return nullptr;
         }
 
@@ -509 +515 @@
         }
 
-        const ast::Stmt * visit( const ast::CatchStmt * node ) override final {
+        const ast::CatchClause * visit( const ast::CatchClause * node ) override final {
                 if ( inCache( node ) ) return nullptr;
                 CatchStmt::Kind kind;
@@ -520 +526 @@
                         break;
                 default:
-                        assertf(false, "Invalid ast::CatchStmt::Kind: %d\n", node->kind);
+                        assertf(false, "Invalid ast::ExceptionKind: %d\n", node->kind);
                 }
                 auto stmt = new CatchStmt(
@@ -528 +534 @@
                         get<Statement>().accept1( node->body )
                 );
-                return stmtPostamble( stmt, node );
-        }
-
-        const ast::Stmt * visit( const ast::FinallyStmt * node ) override final {
+                return clausePostamble( stmt, node ), nullptr;
+        }
+
+        const ast::FinallyClause * visit( const ast::FinallyClause * node ) override final {
                 if ( inCache( node ) ) return nullptr;
                 auto stmt = new FinallyStmt( get<CompoundStmt>().accept1( node->body ) );
-                return stmtPostamble( stmt, node );
+                return clausePostamble( stmt, node ), nullptr;
         }
 
@@ -1884 +1890 @@
                         old->location,
                         GET_ACCEPT_1(condition, Expr),
-                        GET_ACCEPT_V(statements, Stmt),
+                        GET_ACCEPT_V(statements, CaseClause),
                         GET_LABELS_V(old->labels)
                 );
@@ -1892 +1898 @@
         virtual void visit( const CaseStmt * old ) override final {
                 if ( inCache( old ) ) return;
-                this->node = new ast::CaseStmt(
+                this->node = new ast::CaseClause(
                         old->location,
                         GET_ACCEPT_1(condition, Expr),
-                        GET_ACCEPT_V(stmts, Stmt),
-                        GET_LABELS_V(old->labels)
-                );
+                        GET_ACCEPT_V(stmts, Stmt)
+                );
+                auto labels = GET_LABELS_V(old->labels);
+                assertf(labels.empty(), "Labels found on CaseStmt.");
                 cache.emplace( old, this->node );
         }
@@ -2005 +2012 @@
                         old->location,
                         GET_ACCEPT_1(block, CompoundStmt),
-                        GET_ACCEPT_V(handlers, CatchStmt),
-                        GET_ACCEPT_1(finallyBlock, FinallyStmt),
+                        GET_ACCEPT_V(handlers, CatchClause),
+                        GET_ACCEPT_1(finallyBlock, FinallyClause),
                         GET_LABELS_V(old->labels)
                 );
@@ -2026 +2033 @@
                 }
 
-                this->node = new ast::CatchStmt(
+                this->node = new ast::CatchClause(
                         old->location,
                         kind,
                         GET_ACCEPT_1(decl, Decl),
                         GET_ACCEPT_1(cond, Expr),
-                        GET_ACCEPT_1(body, Stmt),
-                        GET_LABELS_V(old->labels)
-                );
+                        GET_ACCEPT_1(body, Stmt)
+                );
+                auto labels = GET_LABELS_V(old->labels);
+                assertf(labels.empty(), "Labels found on CatchStmt.");
                 cache.emplace( old, this->node );
         }
@@ -2039 +2047 @@
         virtual void visit( const FinallyStmt * old ) override final {
                 if ( inCache( old ) ) return;
-                this->node = new ast::FinallyStmt(
-                        old->location,
-                        GET_ACCEPT_1(block, CompoundStmt),
-                        GET_LABELS_V(old->labels)
-                );
+                this->node = new ast::FinallyClause(
+                        old->location,
+                        GET_ACCEPT_1(block, CompoundStmt)
+                );
+                auto labels = GET_LABELS_V(old->labels);
+                assertf(labels.empty(), "Labels found on FinallyStmt.");
                 cache.emplace( old, this->node );
         }