Changeset 7527e63 for src/SynTree/Statement.cc

Timestamp:

Aug 16, 2016, 3:20:06 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

1f6d4624

Parents:

950f7a7 (diff), 7880579 (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.cc (modified) (5 diffs)

src/SynTree/Statement.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 17:52:32 2016
-// Update Count     : 55
+// Last Modified On : Fri Aug 12 13:58:48 2016
+// Update Count     : 62
 //
 
@@ -143 +143 @@
 }
 
-SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_branches ):
-        Statement( _labels ), condition( _condition ), branches( _branches ) {
+SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_statements ):
+        Statement( _labels ), condition( _condition ), statements( _statements ) {
 }
 
 SwitchStmt::SwitchStmt( const SwitchStmt & other ):
         Statement( other ), condition( maybeClone( other.condition ) ) {
-        cloneAll( other.branches, branches );
+        cloneAll( other.statements, statements );
 }
 
 SwitchStmt::~SwitchStmt() {
         delete condition;
-        // destroy branches
-}
-
-void SwitchStmt::add_case( CaseStmt *c ) {}
+        // destroy statements
+}
 
 void SwitchStmt::print( std::ostream &os, int indent ) const {
@@ -164 +162 @@
         os << endl;
 
-        // branches
+        // statements
         std::list<Statement *>::const_iterator i;
-        for ( i = branches.begin(); i != branches.end(); i++)
+        for ( i = statements.begin(); i != statements.end(); i++)
                 (*i)->print( os, indent + 4 );
 
-        //for_each( branches.begin(), branches.end(), mem_fun( bind1st(&Statement::print ), os ));
+        //for_each( statements.begin(), statements.end(), mem_fun( bind1st(&Statement::print ), os ));
 }
 
@@ -187 +185 @@
 }
 
-CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> branches ) {
-        return new CaseStmt( labels, 0, branches, true );
+CaseStmt * CaseStmt::makeDefault( std::list<Label> labels, std::list<Statement *> stmts ) {
+        return new CaseStmt( labels, 0, stmts, true );
 }
 
@@ -311 +309 @@
 }
 
-CatchStmt::CatchStmt( std::list<Label> labels, Declaration *_decl, Statement *_body, bool isCatchRest ) :
-        Statement( labels ), decl ( _decl ), body( _body ), catchRest ( isCatchRest ) {
+CatchStmt::CatchStmt( std::list<Label> labels, Declaration *_decl, Statement *_body, bool catchAny ) :
+        Statement( labels ), decl ( _decl ), body( _body ), catchRest ( catchAny ) {
 }