Changeset c935c3a for src/SynTree/Statement.h

Timestamp:

Sep 13, 2017, 3:03:32 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

ed235b6

Parents:

b2e2e34 (diff), 982832e (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/SynTree/Statement.h (modified) (4 diffs)

src/SynTree/Statement.h

@@ -67 +67 @@
 };
 
-class NullStmt : public CompoundStmt {
+class NullStmt : public Statement {
   public:
         NullStmt();
@@ -155 +155 @@
   public:
         Expression * condition;
+        std::list<Statement *> statements;
 
         SwitchStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &statements );
@@ -170 +171 @@
         virtual SwitchStmt *clone() const { return new SwitchStmt( *this ); }
         virtual void print( std::ostream &os, int indent = 0 ) const;
-  private:
-        std::list<Statement *> statements;
+
 };
 
@@ -327 +327 @@
 class TryStmt : public Statement {
   public:
-        CompoundStmt *block;
+        CompoundStmt * block;
         std::list<CatchStmt *> handlers;
-        FinallyStmt *finallyBlock;
+        FinallyStmt * finallyBlock;
 
         TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock = 0 );