Changes in src/AST/Stmt.hpp [f6e6a55:400b8be]

File:

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

src/AST/Stmt.hpp

@@ -10 +10 @@
 // Created On       : Wed May  8 13:00:00 2019
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed Apr 20 14:34:00 2022
-// Update Count     : 36
+// Last Modified On : Mon Mar 28  9:50:00 2022
+// Update Count     : 35
 //
 
@@ -378 +378 @@
 class WaitForStmt final : public Stmt {
   public:
-        std::vector<ptr<WaitForClause>> clauses;
-        ptr<Expr> timeout_time;
-        ptr<Stmt> timeout_stmt;
-        ptr<Expr> timeout_cond;
-        ptr<Stmt> else_stmt;
-        ptr<Expr> else_cond;
+        struct Target {
+                ptr<Expr> func;
+                std::vector<ptr<Expr>> args;
+        };
+
+        struct Clause {
+                Target target;
+                ptr<Stmt> stmt;
+                ptr<Expr> cond;
+        };
+
+        struct Timeout {
+                ptr<Expr> time;
+                ptr<Stmt> stmt;
+                ptr<Expr> cond;
+        };
+
+        struct OrElse {
+                ptr<Stmt> stmt;
+                ptr<Expr> cond;
+        };
+
+        std::vector<Clause> clauses;
+        Timeout timeout;
+        OrElse orElse;
 
         WaitForStmt( const CodeLocation & loc, const std::vector<Label> && labels = {} )
@@ -392 +411 @@
         WaitForStmt * clone() const override { return new WaitForStmt{ *this }; }
         MUTATE_FRIEND
-};
-
-class WaitForClause final : public StmtClause {
-  public:
-    ptr<Expr> target_func;
-    std::vector<ptr<Expr>> target_args;
-    ptr<Stmt> stmt;
-    ptr<Expr> cond;
-
-    WaitForClause( const CodeLocation & loc )
-                : StmtClause( loc ) {}
-
-        const WaitForClause * accept( Visitor & v ) const override { return v.visit( this ); }
-  private:
-    WaitForClause * clone() const override { return new WaitForClause{ *this }; }
-    MUTATE_FRIEND
 };