Changes in src/SynTree/Statement.h [65cdc1e:046e04a]

File:

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

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug  3 14:08:00 2017
-// Update Count     : 69
+// Last Modified On : Mon Jun 12 13:35:00 2017
+// Update Count     : 67
 //
 
-#pragma once
+#ifndef STATEMENT_H
+#define STATEMENT_H
 
 #include "BaseSyntaxNode.h"
@@ -26 +27 @@
 class Statement : public BaseSyntaxNode {
   public:
-        std::list<Label> labels;
-
         Statement( std::list<Label> labels );
         virtual ~Statement();
@@ -38 +37 @@
         virtual Statement *acceptMutator( Mutator &m ) = 0;
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  protected:
+        std::list<Label> labels;
 };
 
 class CompoundStmt : public Statement {
   public:
-        std::list<Statement*> kids;
-
         CompoundStmt( std::list<Label> labels );
         CompoundStmt( const CompoundStmt &other );
@@ -56 +55 @@
         virtual CompoundStmt *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        std::list<Statement*> kids;
 };
 
@@ -67 +68 @@
         virtual NullStmt *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+
+  private:
 };
 
 class ExprStmt : public Statement {
   public:
-        Expression *expr;
-
         ExprStmt( std::list<Label> labels, Expression *expr );
         ExprStmt( const ExprStmt &other );
@@ -84 +85 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        Expression *expr;
 };
 
 class AsmStmt : public Statement {
   public:
-        bool voltile;
-        ConstantExpr *instruction;
-        std::list<Expression *> output, input;
-        std::list<ConstantExpr *> clobber;
-        std::list<Label> gotolabels;
-
         AsmStmt( std::list<Label> labels, bool voltile, ConstantExpr *instruction, std::list<Expression *> input, std::list<Expression *> output, std::list<ConstantExpr *> clobber, std::list<Label> gotolabels );
         AsmStmt( const AsmStmt &other );
@@ -115 +112 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        bool voltile;
+        ConstantExpr *instruction;
+        std::list<Expression *> output, input;
+        std::list<ConstantExpr *> clobber;
+        std::list<Label> gotolabels;
 };
 
 class IfStmt : public Statement {
   public:
-        Expression *condition;
-        Statement *thenPart;
-        Statement *elsePart;
-
         IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart );
         IfStmt( const IfStmt &other );
@@ -138 +137 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        Expression *condition;
+        Statement *thenPart;
+        Statement *elsePart;
 };
 
 class SwitchStmt : public Statement {
   public:
-        Expression * condition;
-
         SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &statements );
         SwitchStmt( const SwitchStmt &other );
@@ -159 +160 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
   private:
+        Expression * condition;
         std::list<Statement *> statements;
 };
@@ -164 +166 @@
 class CaseStmt : public Statement {
   public:
-        Expression * condition;
-        std::list<Statement *> stmts;
-
         CaseStmt( std::list<Label> labels, Expression *conditions, std::list<Statement *> &stmts, bool isdef = false ) throw(SemanticError);
         CaseStmt( const CaseStmt &other );
@@ -188 +187 @@
         virtual void print( std::ostream &os, int indent = 0 ) const;
   private:
+        Expression * condition;
+        std::list<Statement *> stmts;
         bool _isDefault;
 };
@@ -193 +194 @@
 class WhileStmt : public Statement {
   public:
-        Expression *condition;
-        Statement *body;
-        bool isDoWhile;
-
         WhileStmt( std::list<Label> labels, Expression *condition,
                Statement *body, bool isDoWhile = false );
@@ -213 +210 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        Expression *condition;
+        Statement *body;
+        bool isDoWhile;
 };
 
 class ForStmt : public Statement {
   public:
-        std::list<Statement *> initialization;
-        Expression *condition;
-        Expression *increment;
-        Statement *body;
-
         ForStmt( std::list<Label> labels, std::list<Statement *> initialization,
              Expression *condition = 0, Expression *increment = 0, Statement *body = 0 );
@@ -240 +236 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        std::list<Statement *> initialization;
+        Expression *condition;
+        Expression *increment;
+        Statement *body;
 };
 
@@ -246 +247 @@
         enum Type { Goto = 0, Break, Continue };
 
-        // originalTarget kept for error messages.
-        const Label originalTarget;
+        BranchStmt( std::list<Label> labels, Label target, Type ) throw (SemanticError);
+        BranchStmt( std::list<Label> labels, Expression *computedTarget, Type ) throw (SemanticError);
+
+        Label get_originalTarget() { return originalTarget; }
+        Label get_target() { return target; }
+        void set_target( Label newValue ) { target = newValue; }
+
+        Expression *get_computedTarget() { return computedTarget; }
+        void set_target( Expression * newValue ) { computedTarget = newValue; }
+
+        Type get_type() { return type; }
+        const char *get_typename() { return brType[ type ]; }
+
+        virtual BranchStmt *clone() const { return new BranchStmt( *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:
+        static const char *brType[];
+        Label originalTarget;  // can give better error messages if we remember the label name that the user entered
         Label target;
         Expression *computedTarget;
         Type type;
-
-        BranchStmt( std::list<Label> labels, Label target, Type ) throw (SemanticError);
-        BranchStmt( std::list<Label> labels, Expression *computedTarget, Type ) throw (SemanticError);
-
-        Label get_originalTarget() { return originalTarget; }
-        Label get_target() { return target; }
-        void set_target( Label newValue ) { target = newValue; }
-
-        Expression *get_computedTarget() { return computedTarget; }
-        void set_target( Expression * newValue ) { computedTarget = newValue; }
-
-        Type get_type() { return type; }
-        const char *get_typename() { return brType[ type ]; }
-
-        virtual BranchStmt *clone() const { return new BranchStmt( *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:
-        static const char *brType[];
 };
 
 class ReturnStmt : public Statement {
   public:
-        Expression *expr;
-
         ReturnStmt( std::list<Label> labels, Expression *expr );
         ReturnStmt( const ReturnStmt &other );
@@ -288 +285 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        Expression *expr;
 };
 
@@ -293 +292 @@
   public:
         enum Kind { Terminate, Resume };
-
-        const Kind kind;
-        Expression * expr;
-        Expression * target;
 
         ThrowStmt( std::list<Label> labels, Kind kind, Expression * expr, Expression * target = nullptr );
@@ -312 +307 @@
         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;
 };
 
 class TryStmt : public Statement {
   public:
+        TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock = 0 );
+        TryStmt( const TryStmt &other );
+        virtual ~TryStmt();
+
+        CompoundStmt *get_block() const { return block; }
+        void set_block( CompoundStmt *newValue ) { block = newValue; }
+        std::list<CatchStmt *>& get_catchers() { return handlers; }
+
+        FinallyStmt *get_finally() const { return finallyBlock; }
+        void set_finally( FinallyStmt *newValue ) { finallyBlock = newValue; }
+
+        virtual TryStmt *clone() const { return new TryStmt( *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:
         CompoundStmt *block;
         std::list<CatchStmt *> handlers;
         FinallyStmt *finallyBlock;
-
-        TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock = 0 );
-        TryStmt( const TryStmt &other );
-        virtual ~TryStmt();
-
-        CompoundStmt *get_block() const { return block; }
-        void set_block( CompoundStmt *newValue ) { block = newValue; }
-        std::list<CatchStmt *>& get_catchers() { return handlers; }
-
-        FinallyStmt *get_finally() const { return finallyBlock; }
-        void set_finally( FinallyStmt *newValue ) { finallyBlock = newValue; }
-
-        virtual TryStmt *clone() const { return new TryStmt( *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;
 };
 
@@ -340 +340 @@
   public:
         enum Kind { Terminate, Resume };
-
-        const Kind kind;
-        Declaration *decl;
-        Expression *cond;
-        Statement *body;
 
         CatchStmt( std::list<Label> labels, Kind kind, Declaration *decl,
@@ -363 +358 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+
+  private:
+        Kind kind;
+        Declaration *decl;
+        Expression *cond;
+        Statement *body;
 };
 
 class FinallyStmt : public Statement {
   public:
-        CompoundStmt *block;
-
         FinallyStmt( std::list<Label> labels, CompoundStmt *block );
         FinallyStmt( const FinallyStmt &other );
@@ -380 +379 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        CompoundStmt *block;
 };
 
@@ -386 +387 @@
 class DeclStmt : public Statement {
   public:
-        Declaration *decl;
-
         DeclStmt( std::list<Label> labels, Declaration *decl );
         DeclStmt( const DeclStmt &other );
@@ -399 +398 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+  private:
+        Declaration *decl;
 };
 
@@ -407 +408 @@
 class ImplicitCtorDtorStmt : public Statement {
   public:
-        // Non-owned pointer to the constructor/destructor statement
-        Statement * callStmt;
-
         ImplicitCtorDtorStmt( Statement * callStmt );
         ImplicitCtorDtorStmt( const ImplicitCtorDtorStmt & other );
@@ -421 +419 @@
         virtual Statement *acceptMutator( Mutator &m ) { return m.mutate( this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
+
+  private:
+        // Non-owned pointer to the constructor/destructor statement
+        Statement * callStmt;
 };
 
 
 std::ostream & operator<<( std::ostream & out, const Statement * statement );
+
+#endif // STATEMENT_H
 
 // Local Variables: //