Changeset 8cb149f for src/AST/Stmt.hpp

Timestamp:

Feb 2, 2022, 2:50:46 PM (4 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

21a99cc

Parents:

4de48c5 (diff), 4e7171f (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/AST/Stmt.hpp (modified) (7 diffs)

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 ); }