Changes in src/SynTree/Statement.h [ca78437:294647b]

File:

• src/SynTree/Statement.h (modified) (6 diffs)

src/SynTree/Statement.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jun 12 13:35:00 2017
-// Update Count     : 67
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Aug 12 13:57:46 2016
+// Update Count     : 65
 //
 
@@ -57 +57 @@
   private:
         std::list<Statement*> kids;
-};
-
-class NullStmt : public CompoundStmt {
-  public:
-        NullStmt();
-        NullStmt( std::list<Label> labels );
-
-        virtual NullStmt *clone() const { return new NullStmt( *this ); }
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual NullStmt *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const;
-
-  private:
 };
 
@@ -274 +261 @@
 class ReturnStmt : public Statement {
   public:
-        ReturnStmt( std::list<Label> labels, Expression *expr );
+        ReturnStmt( std::list<Label> labels, Expression *expr, bool throwP = false );
         ReturnStmt( const ReturnStmt &other );
         virtual ~ReturnStmt();
@@ -287 +274 @@
   private:
         Expression *expr;
-};
-
-class ThrowStmt : public Statement {
-  public:
-        enum Kind { Terminate, Resume };
-
-        ThrowStmt( std::list<Label> labels, Kind kind, Expression * expr, Expression * target = nullptr );
-        ThrowStmt( const ThrowStmt &other );
-        virtual ~ThrowStmt();
-
-        Kind get_kind() { return kind; }
-        Expression * get_expr() { return expr; }
-        void set_expr( Expression * newExpr ) { expr = newExpr; }
-        Expression * get_target() { return target; }
-        void set_target( Expression * newTarget ) { target = newTarget; }
-
-        virtual ThrowStmt *clone() const { return new ThrowStmt( *this ); }
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os, int indent = 0 ) const;
-  private:
-        Kind kind;
-        Expression * expr;
-        Expression * target;
+        bool isThrow;
+};
+
+
+class NullStmt : public CompoundStmt {
+  public:
+        NullStmt();
+        NullStmt( std::list<Label> labels );
+
+        virtual NullStmt *clone() const { return new NullStmt( *this ); }
+        virtual void accept( Visitor &v ) { v.visit( this ); }
+        virtual NullStmt *acceptMutator( Mutator &m ) { return m.mutate( this ); }
+        virtual void print( std::ostream &os, int indent = 0 ) const;
+
+  private:
 };
 
@@ -339 +317 @@
 class CatchStmt : public Statement {
   public:
-        enum Kind { Terminate, Resume };
-
-        CatchStmt( std::list<Label> labels, Kind kind, Declaration *decl,
-                   Expression *cond, Statement *body );
+        CatchStmt( std::list<Label> labels, Declaration *decl, Statement *body, bool catchAny = false );
         CatchStmt( const CatchStmt &other );
         virtual ~CatchStmt();
 
-        Kind get_kind() { return kind; }
         Declaration *get_decl() { return decl; }
         void set_decl( Declaration *newValue ) { decl = newValue; }
-        Expression *get_cond() { return cond; }
-        void set_cond( Expression *newCond ) { cond = newCond; }
+
         Statement *get_body() { return body; }
         void set_body( Statement *newValue ) { body = newValue; }
@@ -360 +333 @@
 
   private:
-        Kind kind;
         Declaration *decl;
-        Expression *cond;
         Statement *body;
+        bool catchRest;
 };