Changes in src/Parser/StatementNode.cc [59db689:1db21619]

File:

• src/Parser/StatementNode.cc (modified) (8 diffs)

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  6 23:25:41 2015
-// Update Count     : 19
+// Last Modified On : Thu Jul 16 16:20:24 2015
+// Update Count     : 30
 //
 
@@ -72 +72 @@
         delete control;
         delete block;
-        delete labels;
         delete target;
         delete decl;
@@ -103 +102 @@
 }
 
-void StatementNode::set_control( ExpressionNode *c ) {
-        control = c;
-}
-
-StatementNode * StatementNode::set_block( StatementNode *b ) {
-        block = b;
-
-        return this;
-}
-
-ExpressionNode *StatementNode::get_control() const {
-        return control;
-}
-
-StatementNode *StatementNode::get_block() const {
-        return block;
-}
-
-StatementNode::Type StatementNode::get_type() const {
-        return type;
-}
-
 StatementNode *StatementNode::add_label( const std::string *l ) {
         if ( l != 0 ) {
-                if ( labels == 0 )
-                        labels = new std::list<std::string>();
-
-                labels->push_front(*l ); 
+                labels.push_front( *l ); 
                 delete l;
         } // if
         return this;
 }
-
-std::list<std::string> *StatementNode::get_labels() const { return labels; }
 
 StatementNode *StatementNode::add_controlexp( ExpressionNode *e ) {
@@ -170 +142 @@
 
 void StatementNode::print( std::ostream &os, int indent ) const {
-        if ( labels != 0 ) {
-                if ( ! labels->empty()) {
-                        std::list<std::string>::const_iterator i;
-
-                        os << string( indent, ' ' );
-                        for ( i = labels->begin(); i != labels->end(); i++ )
-                                os << *i << ":";
-                        os << endl;
-                } // if
+        if ( ! labels.empty()) {
+                std::list<std::string>::const_iterator i;
+
+                os << string( indent, ' ' );
+                for ( i = labels.begin(); i != labels.end(); i++ )
+                        os << *i << ":";
+                os << endl;
         } // if
 
@@ -225 +195 @@
         std::list<Label> labs;
 
-        if ( labels != 0 ) {
+        if ( ! labels.empty() ) {
                 std::back_insert_iterator< std::list<Label> > lab_it( labs );
-                copy( labels->begin(), labels->end(), lab_it );
+                copy( labels.begin(), labels.end(), lab_it );
         } // if
 
@@ -271 +241 @@
                         assert( ctl != 0 );
 
-                        Statement *stmt = 0;
-                        if ( ctl->get_init() != 0 )
-                                stmt = ctl->get_init()->build();
+                        std::list<Statement *> init;
+                        if ( ctl->get_init() != 0 ) {
+                                buildList( ctl->get_init(), init );
+                        } // if
 
                         Expression *cond = 0;
@@ -283 +254 @@
                                 incr = ctl->get_change()->build();
 
-                        return new ForStmt( labs, stmt, cond, incr, branches.front() );
+                        return new ForStmt( labs, init, cond, incr, branches.front() );
                 }
           case Switch:
@@ -377 +348 @@
 Statement *CompoundStmtNode::build() const {
         std::list<Label> labs;
-        std::list<std::string> *labels = get_labels();
-
-        if ( labels != 0 ) {
+        const std::list<std::string> &labels = get_labels();
+
+        if ( ! labels.empty() ) {
                 std::back_insert_iterator< std::list<Label> > lab_it( labs );
-                copy( labels->begin(), labels->end(), lab_it );
+                copy( labels.begin(), labels.end(), lab_it );
         } // if