Changes in src/AST/Convert.cpp [ff3b0249:1387ea0]

File:

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

src/AST/Convert.cpp

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thu May 09 15::37::05 2019
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  2 13:19:22 2022
-// Update Count     : 41
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed Jul 14 16:15:00 2021
+// Update Count     : 37
 //
 
@@ -393 +393 @@
                 auto stmt = new IfStmt(
                         get<Expression>().accept1( node->cond ),
-                        get<Statement>().accept1( node->then ),
-                        get<Statement>().accept1( node->else_ ),
+                        get<Statement>().accept1( node->thenPart ),
+                        get<Statement>().accept1( node->elsePart ),
                         get<Statement>().acceptL( node->inits )
                 );
@@ -419 +419 @@
         }
 
-        const ast::Stmt * visit( const ast::WhileDoStmt * node ) override final {
+        const ast::Stmt * visit( const ast::WhileStmt * node ) override final {
                 if ( inCache( node ) ) return nullptr;
                 auto inits = get<Statement>().acceptL( node->inits );
-                auto stmt = new WhileDoStmt(
+                auto stmt = new WhileStmt(
                         get<Expression>().accept1( node->cond ),
                         get<Statement>().accept1( node->body ),
-                        get<Statement>().accept1( node->else_ ),
                         inits,
                         node->isDoWhile
@@ -438 +437 @@
                         get<Expression>().accept1( node->cond ),
                         get<Expression>().accept1( node->inc ),
-                        get<Statement>().accept1( node->body ),
-                        get<Statement>().accept1( node->else_ )
+                        get<Statement>().accept1( node->body )
                 );
                 return stmtPostamble( stmt, node );
@@ -1874 +1872 @@
                         old->location,
                         GET_ACCEPT_1(condition, Expr),
-                        GET_ACCEPT_1(then, Stmt),
-                        GET_ACCEPT_1(else_, Stmt),
+                        GET_ACCEPT_1(thenPart, Stmt),
+                        GET_ACCEPT_1(elsePart, Stmt),
                         GET_ACCEPT_V(initialization, Stmt),
                         GET_LABELS_V(old->labels)
@@ -1904 +1902 @@
         }
 
-        virtual void visit( const WhileDoStmt * old ) override final {
+        virtual void visit( const WhileStmt * old ) override final {
                 if ( inCache( old ) ) return;
-                this->node = new ast::WhileDoStmt(
+                this->node = new ast::WhileStmt(
                         old->location,
                         GET_ACCEPT_1(condition, Expr),
                         GET_ACCEPT_1(body, Stmt),
-                        GET_ACCEPT_1(else_, Stmt),
                         GET_ACCEPT_V(initialization, Stmt),
                         old->isDoWhile,
@@ -1926 +1923 @@
                         GET_ACCEPT_1(increment, Expr),
                         GET_ACCEPT_1(body, Stmt),
-                        GET_ACCEPT_1(else_, Stmt),
                         GET_LABELS_V(old->labels)
                 );