Changeset 6ac5223 for src/SynTree/Statement.h

Timestamp:

Aug 17, 2017, 3:42:21 PM (8 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:

e50e9ff

Parents:

97e3296 (diff), 21f0aa8 (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) (3 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 : Thr Aug  3 14:08:00 2017
-// Update Count     : 69
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Aug 16 16:28:55 2017
+// Update Count     : 70
 //
 
 #pragma once
 
-#include "BaseSyntaxNode.h"
-#include "Label.h"
-#include "Mutator.h"
-#include "SynTree.h"
-#include "Type.h"
-#include "Visitor.h"
-#include "Common/SemanticError.h"
+#include <iosfwd>                  // for ostream
+#include <list>                    // for list
+#include <memory>                  // for allocator
+
+#include "BaseSyntaxNode.h"        // for BaseSyntaxNode
+#include "Common/SemanticError.h"  // for SemanticError
+#include "Label.h"                 // for Label
+#include "Mutator.h"               // for Mutator
+#include "Visitor.h"               // for Visitor
+
+class CatchStmt;
+class ConstantExpr;
+class Declaration;
+class Expression;
+class FinallyStmt;
 
 class Statement : public BaseSyntaxNode {
@@ -119 +127 @@
 class IfStmt : public Statement {
   public:
+        std::list<Statement *> initialization;
         Expression *condition;
         Statement *thenPart;
@@ -127 +136 @@
         virtual ~IfStmt();
 
+        std::list<Statement *> &get_initialization() { return initialization; }
+        void set_initialization( std::list<Statement *> newValue ) { initialization = newValue; }
         Expression *get_condition() { return condition; }
         void set_condition( Expression *newValue ) { condition = newValue; }