Changeset 3b0bc16 for src/AST

Timestamp:

Feb 1, 2022, 8:22:12 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

fde0a58

Parents:

729c991

Message:

change class name WhileStmt to WhileDoStmt, add else clause to WhileDoStmt and ForStmt, change names thenPart/ElsePart to then/else_

Location:

src/AST

Files:

• Convert.cpp (modified) (5 diffs)
• Fwd.hpp (modified) (2 diffs)
• Node.cpp (modified) (2 diffs)
• Pass.hpp (modified) (1 diff)
• Pass.impl.hpp (modified) (3 diffs)
• Print.cpp (modified) (2 diffs)
• Stmt.hpp (modified) (7 diffs)
• Visitor.hpp (modified) (2 diffs)

src/AST/Convert.cpp

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

src/AST/Fwd.hpp

@@ -10 +10 @@
 // Created On       : Wed May  8 16:05:00 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 12 18:37:39 2021
-// Update Count     : 4
+// Last Modified On : Tue Feb  1 09:08:33 2022
+// Update Count     : 5
 //
 
@@ -44 +44 @@
 class DirectiveStmt;
 class IfStmt;
-class WhileStmt;
+class WhileDoStmt;
 class ForStmt;
 class SwitchStmt;

src/AST/Node.cpp

@@ -10 +10 @@
 // Created On       : Thu May 16 14:16:00 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 12 18:25:06 2021
-// Update Count     : 2
+// Last Modified On : Tue Feb  1 09:09:39 2022
+// Update Count     : 3
 //
 
@@ -146 +146 @@
 template class ast::ptr_base< ast::IfStmt, ast::Node::ref_type::weak >;
 template class ast::ptr_base< ast::IfStmt, ast::Node::ref_type::strong >;
-template class ast::ptr_base< ast::WhileStmt, ast::Node::ref_type::weak >;
-template class ast::ptr_base< ast::WhileStmt, ast::Node::ref_type::strong >;
+template class ast::ptr_base< ast::WhileDoStmt, ast::Node::ref_type::weak >;
+template class ast::ptr_base< ast::WhileDoStmt, ast::Node::ref_type::strong >;
 template class ast::ptr_base< ast::ForStmt, ast::Node::ref_type::weak >;
 template class ast::ptr_base< ast::ForStmt, ast::Node::ref_type::strong >;

src/AST/Pass.hpp

@@ -146 +146 @@
         const ast::Stmt *             visit( const ast::DirectiveStmt        * ) override final;
         const ast::Stmt *             visit( const ast::IfStmt               * ) override final;
-        const ast::Stmt *             visit( const ast::WhileStmt            * ) override final;
+        const ast::Stmt *             visit( const ast::WhileDoStmt          * ) override final;
         const ast::Stmt *             visit( const ast::ForStmt              * ) override final;
         const ast::Stmt *             visit( const ast::SwitchStmt           * ) override final;

src/AST/Pass.impl.hpp

@@ -756 +756 @@
                 maybe_accept( node, &IfStmt::inits    );
                 maybe_accept( node, &IfStmt::cond     );
-                maybe_accept_as_compound( node, &IfStmt::thenPart );
-                maybe_accept_as_compound( node, &IfStmt::elsePart );
+                maybe_accept_as_compound( node, &IfStmt::then );
+                maybe_accept_as_compound( node, &IfStmt::else_ );
         }
 
@@ -764 +764 @@
 
 //--------------------------------------------------------------------------
-// WhileStmt
-template< typename core_t >
-const ast::Stmt * ast::Pass< core_t >::visit( const ast::WhileStmt * node ) {
+// WhileDoStmt
+template< typename core_t >
+const ast::Stmt * ast::Pass< core_t >::visit( const ast::WhileDoStmt * node ) {
         VISIT_START( node );
 
@@ -772 +772 @@
                 // while statements introduce a level of scope (for the initialization)
                 guard_symtab guard { *this };
-                maybe_accept( node, &WhileStmt::inits );
-                maybe_accept( node, &WhileStmt::cond  );
-                maybe_accept_as_compound( node, &WhileStmt::body  );
+                maybe_accept( node, &WhileDoStmt::inits );
+                maybe_accept( node, &WhileDoStmt::cond  );
+                maybe_accept_as_compound( node, &WhileDoStmt::body  );
         }
 

src/AST/Print.cpp

@@ -511 +511 @@
                 ++indent;
                 os << indent;
-                safe_print( node->thenPart );
-                --indent;
-
-                if ( node->elsePart != 0 ) {
+                safe_print( node->then );
+                --indent;
+
+                if ( node->else_ != 0 ) {
                         os << indent << "... else:" << endl;
                         ++indent;
                         os << indent;
-                        node->elsePart->accept( *this );
+                        node->else_->accept( *this );
                         --indent;
                 } // if
@@ -524 +524 @@
         }
 
-        virtual const ast::Stmt * visit( const ast::WhileStmt * node ) override final {
+        virtual const ast::Stmt * visit( const ast::WhileDoStmt * node ) override final {
                 if ( node->isDoWhile ) { os << "Do-"; }
                 os << "While on condition:" << endl;

src/AST/Stmt.hpp

@@ -10 +10 @@
 // Created On       : Wed May  8 13:00:00 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jan 31 22:38:53 2022
-// Update Count     : 12
+// Last Modified On : Tue Feb  1 17:44:46 2022
+// Update Count     : 24
 //
 
@@ -42 +42 @@
                 : ParseNode(loc), labels(std::move(labels)) {}
 
-        Stmt(const Stmt& o) : ParseNode(o), labels(o.labels) {}
+        Stmt(const Stmt & o) : ParseNode(o), labels(o.labels) {}
 
         const Stmt * accept( Visitor & v ) const override = 0;
@@ -56 +56 @@
 
         CompoundStmt(const CodeLocation & loc, std::list<ptr<Stmt>> && ks = {},
-                                 std::vector<Label>&& labels = {} )
+                                 std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), kids(std::move(ks)) {}
 
-        CompoundStmt( const CompoundStmt& o );
-        CompoundStmt( CompoundStmt&& o ) = default;
+        CompoundStmt( const CompoundStmt & o );
+        CompoundStmt( CompoundStmt && o ) = default;
 
         void push_back( const Stmt * s ) { kids.emplace_back( s ); }
@@ -88 +88 @@
         ptr<Expr> expr;
 
-        ExprStmt( const CodeLocation& loc, const Expr* e, std::vector<Label>&& labels = {} )
+        ExprStmt( const CodeLocation & loc, const Expr* e, std::vector<Label> && labels = {} )
                 : Stmt(loc, std::move(labels)), expr(e) {}
 
@@ -139 +139 @@
   public:
         ptr<Expr> cond;
-        ptr<Stmt> thenPart;
-        ptr<Stmt> elsePart;
+        ptr<Stmt> then;
+        ptr<Stmt> else_;
         std::vector<ptr<Stmt>> inits;
 
-        IfStmt( const CodeLocation & loc, const Expr * cond, const Stmt * thenPart,
-                        const Stmt * elsePart = nullptr, std::vector<ptr<Stmt>> && inits = {},
+        IfStmt( const CodeLocation & loc, const Expr * cond, const Stmt * then,
+                        const Stmt * else_ = nullptr, std::vector<ptr<Stmt>> && inits = {},
                         std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), cond(cond), thenPart(thenPart), elsePart(elsePart),
+                : Stmt(loc, std::move(labels)), cond(cond), then(then), else_(else_),
                   inits(std::move(inits)) {}
 
@@ -191 +191 @@
 
 // While loop: while (...) ... else ... or do ... while (...) else ...;
-class WhileStmt final : public Stmt {
+class WhileDoStmt final : public Stmt {
   public:
         ptr<Expr> cond;
         ptr<Stmt> body;
-        ptr<Stmt> elsePart;
+        ptr<Stmt> else_;
         std::vector<ptr<Stmt>> inits;
         bool isDoWhile;
 
-        WhileStmt( const CodeLocation & loc, const Expr * cond, const Stmt * body,
+        WhileDoStmt( const CodeLocation & loc, const Expr * cond, const Stmt * body,
                            std::vector<ptr<Stmt>> && inits, bool isDoWhile = false, std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), cond(cond), body(body), inits(std::move(inits)), isDoWhile(isDoWhile) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
-        WhileStmt * clone() const override { return new WhileStmt{ *this }; }
+                : Stmt(loc, std::move(labels)), cond(cond), body(body), else_(nullptr), inits(std::move(inits)), isDoWhile(isDoWhile) {}
+
+        WhileDoStmt( const CodeLocation & loc, const Expr * cond, const Stmt * body, const Stmt * else_,
+                           std::vector<ptr<Stmt>> && inits, bool isDoWhile = false, std::vector<Label> && labels = {} )
+                : Stmt(loc, std::move(labels)), cond(cond), body(body), else_(else_), inits(std::move(inits)), isDoWhile(isDoWhile) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+  private:
+        WhileDoStmt * clone() const override { return new WhileDoStmt{ *this }; }
         MUTATE_FRIEND
 };
@@ -216 +220 @@
         ptr<Expr> inc;
         ptr<Stmt> body;
-        ptr<Stmt> elsePart;
+        ptr<Stmt> else_;
 
         ForStmt( const CodeLocation & loc, std::vector<ptr<Stmt>> && inits, const Expr * cond,
-                         const Expr * inc, const Stmt * body, std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), inits(std::move(inits)), cond(cond), inc(inc), body(body) {}
+                         const Expr * inc, const Stmt * body, std::vector<Label> && label = {} )
+                : Stmt(loc, std::move(label)), inits(std::move(inits)), cond(cond), inc(inc), body(body), else_(nullptr) {}
+
+        ForStmt( const CodeLocation & loc, std::vector<ptr<Stmt>> && inits, const Expr * cond,
+                         const Expr * inc, const Stmt * body, const Stmt * else_, std::vector<Label> && labels = {} )
+                : Stmt(loc, std::move(labels)), inits(std::move(inits)), cond(cond), inc(inc), body(body), else_(else_) {}
 
         const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }

src/AST/Visitor.hpp

@@ -10 +10 @@
 // Created On       : Thr May 9 15:28:00 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 12 18:25:07 2021
-// Update Count     : 1
+// Last Modified On : Tue Feb  1 09:09:34 2022
+// Update Count     : 2
 //
 
@@ -38 +38 @@
     virtual const ast::Stmt *             visit( const ast::DirectiveStmt        * ) = 0;
     virtual const ast::Stmt *             visit( const ast::IfStmt               * ) = 0;
-    virtual const ast::Stmt *             visit( const ast::WhileStmt            * ) = 0;
+    virtual const ast::Stmt *             visit( const ast::WhileDoStmt          * ) = 0;
     virtual const ast::Stmt *             visit( const ast::ForStmt              * ) = 0;
     virtual const ast::Stmt *             visit( const ast::SwitchStmt           * ) = 0;