Changes in src/AST/Stmt.hpp [89a5a1f:b8ab91a]

File:

• src/AST/Stmt.hpp (modified) (12 diffs)

src/AST/Stmt.hpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // 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 By : Andrew Beach
+// Last Modified On : Fri May 17 12:45:00 2019
+// Update Count     : 5
 //
 
@@ -17 +17 @@
 
 #include <list>
-#include <utility>                                                                              // for move
+#include <utility>                // for move
 #include <vector>
 
 #include "Label.hpp"
-#include "Node.hpp"                                                                             // for node, ptr
+#include "Node.hpp"               // for node, ptr
 #include "ParseNode.hpp"
 #include "Visitor.hpp"
@@ -27 +27 @@
 
 // Must be included in *all* AST classes; should be #undef'd at the end of the file
-#define MUTATE_FRIEND                                                                                                   \
+#define MUTATE_FRIEND \
     template<typename node_t> friend node_t * mutate(const node_t * node); \
         template<typename node_t> friend node_t * shallowCopy(const node_t * node);
 
 namespace ast {
+
 class Expr;
 
-// Base statement node
+/// Base statement node
 class Stmt : public ParseNode {
-  public:
+public:
         std::vector<Label> labels;
 
         Stmt( const CodeLocation & loc, std::vector<Label> && labels = {} )
-                : ParseNode(loc), labels(std::move(labels)) {}
+        : ParseNode(loc), labels(std::move(labels)) {}
 
         Stmt(const Stmt& o) : ParseNode(o), labels(o.labels) {}
 
         const Stmt * accept( Visitor & v ) const override = 0;
-  private:
+private:
         Stmt * clone() const override = 0;
         MUTATE_FRIEND
 };
 
-// Compound statement: { ... }
+/// Compound statement `{ ... }`
 class CompoundStmt final : public Stmt {
-  public:
+public:
         std::list<ptr<Stmt>> kids;
 
         CompoundStmt(const CodeLocation & loc, std::list<ptr<Stmt>> && ks = {},
-                                 std::vector<Label>&& labels = {} )
-                : Stmt(loc, std::move(labels)), kids(std::move(ks)) {}
+                std::vector<Label>&& labels = {} )
+        : Stmt(loc, std::move(labels)), kids(std::move(ks)) {}
 
         CompoundStmt( const CompoundStmt& o );
@@ -66 +67 @@
 
         const CompoundStmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+private:
         CompoundStmt * clone() const override { return new CompoundStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Empty statment: ;
+/// Empty statment `;`
 class NullStmt final : public Stmt {
-  public:
+public:
         NullStmt( const CodeLocation & loc, std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)) {}
+        : Stmt(loc, std::move(labels)) {}
 
         const NullStmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+private:
         NullStmt * clone() const override { return new NullStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Expression wrapped by statement
+/// Expression wrapped by statement
 class ExprStmt final : public Stmt {
-  public:
+public:
         ptr<Expr> expr;
 
         ExprStmt( const CodeLocation& loc, const Expr* e, std::vector<Label>&& labels = {} )
-                : Stmt(loc, std::move(labels)), expr(e) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+        : Stmt(loc, std::move(labels)), expr(e) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         ExprStmt * clone() const override { return new ExprStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Assembly statement: asm ... ( "..." : ... )
+/// Assembly statement `asm ... ( "..." : ... )`
 class AsmStmt final : public Stmt {
-  public:
+public:
         bool isVolatile;
         ptr<Expr> instruction;
@@ -107 +108 @@
 
         AsmStmt( const CodeLocation & loc, bool isVolatile, const Expr * instruction,
-                         std::vector<ptr<Expr>> && output, std::vector<ptr<Expr>> && input,
-                         std::vector<ptr<ConstantExpr>> && clobber, std::vector<Label> && gotoLabels,
-                         std::vector<Label> && labels = {})
-                : Stmt(loc, std::move(labels)), isVolatile(isVolatile), instruction(instruction),
-                  output(std::move(output)), input(std::move(input)), clobber(std::move(clobber)),
-                  gotoLabels(std::move(gotoLabels)) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+                std::vector<ptr<Expr>> && output, std::vector<ptr<Expr>> && input,
+                std::vector<ptr<ConstantExpr>> && clobber, std::vector<Label> && gotoLabels,
+                std::vector<Label> && labels = {})
+        : Stmt(loc, std::move(labels)), isVolatile(isVolatile), instruction(instruction),
+          output(std::move(output)), input(std::move(input)), clobber(std::move(clobber)),
+          gotoLabels(std::move(gotoLabels)) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         AsmStmt * clone() const override { return new AsmStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// C-preprocessor directive: #...
+/// C-preprocessor directive `#...`
 class DirectiveStmt final : public Stmt {
-  public:
+public:
         std::string directive;
 
         DirectiveStmt( const CodeLocation & loc, const std::string & directive,
-                                   std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), directive(directive) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+                std::vector<Label> && labels = {} )
+        : Stmt(loc, std::move(labels)), directive(directive) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         DirectiveStmt * clone() const override { return new DirectiveStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// If statement: if (...) ... else ...
+/// If conditional statement `if (...) ... else ...`
 class IfStmt final : public Stmt {
-  public:
+public:
         ptr<Expr> cond;
         ptr<Stmt> thenPart;
@@ -144 +145 @@
 
         IfStmt( const CodeLocation & loc, const Expr * cond, const Stmt * thenPart,
-                        const Stmt * elsePart = nullptr, std::vector<ptr<Stmt>> && inits = {},
-                        std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), cond(cond), thenPart(thenPart), elsePart(elsePart),
-                  inits(std::move(inits)) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+                const Stmt * elsePart = nullptr, std::vector<ptr<Stmt>> && inits = {},
+                std::vector<Label> && labels = {} )
+        : Stmt(loc, std::move(labels)), cond(cond), thenPart(thenPart), elsePart(elsePart),
+          inits(std::move(inits)) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         IfStmt * clone() const override { return new IfStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Switch or choose statement: switch (...) { ... }
+/// Switch or choose conditional statement `switch (...) { ... }`
 class SwitchStmt final : public Stmt {
-  public:
+public:
         ptr<Expr> cond;
         std::vector<ptr<Stmt>> stmts;
 
         SwitchStmt( const CodeLocation & loc, const Expr * cond, std::vector<ptr<Stmt>> && stmts,
-                                std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), cond(cond), stmts(std::move(stmts)) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+                std::vector<Label> && labels = {} )
+        : Stmt(loc, std::move(labels)), cond(cond), stmts(std::move(stmts)) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         SwitchStmt * clone() const override { return new SwitchStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Case label: case ...: or default:
+/// Case label `case ...:` `default:`
 class CaseStmt final : public Stmt {
-  public:
-        // Null for the default label.
+public:
+        /// Null for the default label.
         ptr<Expr> cond;
         std::vector<ptr<Stmt>> stmts;
 
         CaseStmt( const CodeLocation & loc, const Expr * cond, std::vector<ptr<Stmt>> && stmts,
-                          std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), cond(cond), stmts(std::move(stmts)) {}
+                std::vector<Label> && labels = {} )
+        : Stmt(loc, std::move(labels)), cond(cond), stmts(std::move(stmts)) {}
 
         bool isDefault() const { return !cond; }
 
         const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+private:
         CaseStmt * clone() const override { return new CaseStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// While loop: while (...) ... else ... or do ... while (...) else ...;
+/// While loop `while (...) ...` `do ... while (...);
 class WhileStmt final : public Stmt {
-  public:
+public:
         ptr<Expr> cond;
         ptr<Stmt> body;
-        ptr<Stmt> elsePart;
         std::vector<ptr<Stmt>> inits;
         bool isDoWhile;
 
         WhileStmt( 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:
+                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 }; }
         MUTATE_FRIEND
 };
 
-// For loop: for (... ; ... ; ...) ... else ...
+/// For loop `for (... ; ... ; ...) ...`
 class ForStmt final : public Stmt {
-  public:
+public:
         std::vector<ptr<Stmt>> inits;
         ptr<Expr> cond;
         ptr<Expr> inc;
         ptr<Stmt> body;
-        ptr<Stmt> elsePart;
 
         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 Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+                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 Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         ForStmt * clone() const override { return new ForStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Branch control flow statement: goto ... or break or continue or fallthru
+/// Branch control flow statement `goto ...` `break` `continue` `fallthru`
 class BranchStmt final : public Stmt {
-  public:
+public:
         enum Kind { Goto, Break, Continue, FallThrough, FallThroughDefault };
         static constexpr size_t kindEnd = 1 + (size_t)FallThroughDefault;
@@ -240 +241 @@
 
         BranchStmt( const CodeLocation & loc, Kind kind, Label target,
-                                std::vector<Label> && labels = {} );
+                std::vector<Label> && labels = {} );
         BranchStmt( const CodeLocation & loc, const Expr * computedTarget,
-                                std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), originalTarget(loc), target(loc),
-                  computedTarget(computedTarget), kind(Goto) {}
+                std::vector<Label> && labels = {} )
+        : Stmt(loc, std::move(labels)), originalTarget(loc), target(loc),
+          computedTarget(computedTarget), kind(Goto) {}
 
         const char * kindName() const { return kindNames[kind]; }
 
         const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+private:
         BranchStmt * clone() const override { return new BranchStmt{ *this }; }
         MUTATE_FRIEND
@@ -256 +257 @@
 };
 
-// Return statement: return ...
+/// Return statement `return ...`
 class ReturnStmt final : public Stmt {
-  public:
+public:
         ptr<Expr> expr;
 
         ReturnStmt( const CodeLocation & loc, const Expr * expr, std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), expr(expr) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+        : Stmt(loc, std::move(labels)), expr(expr) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         ReturnStmt * clone() const override { return new ReturnStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Kind of exception
+/// Kind of exception
 enum ExceptionKind { Terminate, Resume };
 
-// Throw statement: throw ...
+/// Throw statement `throw ...`
 class ThrowStmt final : public Stmt {
-  public:
+public:
         ptr<Expr> expr;
         ptr<Expr> target;
@@ -283 +284 @@
                 const CodeLocation & loc, ExceptionKind kind, const Expr * expr, const Expr * target,
                 std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), expr(expr), target(target), kind(kind) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+        : Stmt(loc, std::move(labels)), expr(expr), target(target), kind(kind) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         ThrowStmt * clone() const override { return new ThrowStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Try statement: try { ... } ...
+/// Try statement `try { ... } ...`
 class TryStmt final : public Stmt {
-  public:
+public:
         ptr<CompoundStmt> body;
         std::vector<ptr<CatchStmt>> handlers;
@@ -302 +303 @@
                 std::vector<ptr<CatchStmt>> && handlers, const FinallyStmt * finally,
                 std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), body(body), handlers(std::move(handlers)), finally(finally) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+        : Stmt(loc, std::move(labels)), body(body), handlers(std::move(handlers)), finally(finally) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         TryStmt * clone() const override { return new TryStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Catch clause of try statement
+/// Catch clause of try statement
 class CatchStmt final : public Stmt {
-  public:
+public:
         ptr<Decl> decl;
         ptr<Expr> cond;
@@ -321 +322 @@
                 const CodeLocation & loc, ExceptionKind kind, const Decl * decl, const Expr * cond,
                 const Stmt * body, std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), decl(decl), cond(cond), body(body), kind(kind) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+        : Stmt(loc, std::move(labels)), decl(decl), cond(cond), body(body), kind(kind) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         CatchStmt * clone() const override { return new CatchStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Finally clause of try statement
+/// Finally clause of try statement
 class FinallyStmt final : public Stmt {
-  public:
+public:
         ptr<CompoundStmt> body;
 
         FinallyStmt( const CodeLocation & loc, const CompoundStmt * body,
-                                 std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), body(body) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+                std::vector<Label> && labels = {} )
+        : Stmt(loc, std::move(labels)), body(body) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         FinallyStmt * clone() const override { return new FinallyStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Suspend statement
+/// Suspend statement
 class SuspendStmt final : public Stmt {
-  public:
+public:
         ptr<CompoundStmt> then;
         enum Type { None, Coroutine, Generator } type = None;
 
         SuspendStmt( const CodeLocation & loc, const CompoundStmt * then, Type type, std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), then(then), type(type) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+        : Stmt(loc, std::move(labels)), then(then), type(type) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         SuspendStmt * clone() const override { return new SuspendStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Waitfor statement: when (...) waitfor (... , ...) ... timeout(...) ... else ...
+/// Wait for concurrency statement `when (...) waitfor (... , ...) ... timeout(...) ... else ...`
 class WaitForStmt final : public Stmt {
-  public:
+public:
         struct Target {
                 ptr<Expr> func;
@@ -389 +390 @@
 
         WaitForStmt( const CodeLocation & loc, std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+        : Stmt(loc, std::move(labels)) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         WaitForStmt * clone() const override { return new WaitForStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Any declaration in a (compound) statement.
+/// Any declaration in a (compound) statement.
 class DeclStmt final : public Stmt {
-  public:
+public:
         ptr<Decl> decl;
 
         DeclStmt( const CodeLocation & loc, const Decl * decl, std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), decl(decl) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+        : Stmt(loc, std::move(labels)), decl(decl) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         DeclStmt * clone() const override { return new DeclStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Represents an implicit application of a constructor or destructor.
+/// Represents an implicit application of a constructor or destructor.
 class ImplicitCtorDtorStmt final : public Stmt {
-  public:
+public:
         ptr<Stmt> callStmt;
 
         ImplicitCtorDtorStmt( const CodeLocation & loc, const Stmt * callStmt,
-                                                  std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), callStmt(callStmt) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+                std::vector<Label> && labels = {} )
+        : Stmt(loc, std::move(labels)), callStmt(callStmt) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         ImplicitCtorDtorStmt * clone() const override { return new ImplicitCtorDtorStmt{ *this }; }
         MUTATE_FRIEND
 };
 
-// Mutex Statement
+/// Mutex Statement
 class MutexStmt final : public Stmt {
-  public:
+public:
         ptr<Stmt> stmt;
         std::vector<ptr<Expr>> mutexObjs;
 
         MutexStmt( const CodeLocation & loc, const Stmt * stmt, 
-                           std::vector<ptr<Expr>> && mutexes, std::vector<Label> && labels = {} )
-                : Stmt(loc, std::move(labels)), stmt(stmt), mutexObjs(std::move(mutexes)) {}
-
-        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
+                std::vector<ptr<Expr>> && mutexes, std::vector<Label> && labels = {} )
+        : Stmt(loc, std::move(labels)), stmt(stmt), mutexObjs(std::move(mutexes)) {}
+
+        const Stmt * accept( Visitor & v ) const override { return v.visit( this ); }
+private:
         MutexStmt * clone() const override { return new MutexStmt{ *this }; }
         MUTATE_FRIEND
 };
-} // namespace ast
+
+}
 
 #undef MUTATE_FRIEND
 
 // Local Variables: //
+// tab-width: 4 //
 // mode: c++ //
+// compile-command: "make install" //
 // End: //