Changes in src/Parser/StatementNode.cc [145f1fc:7f5566b]

File:

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

src/Parser/StatementNode.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 14:59:41 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 14 12:20:44 2015
-// Update Count     : 21
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 30 14:39:39 2015
+// Update Count     : 130
 //
 
@@ -36 +36 @@
 StatementNode::StatementNode() : ParseNode(), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {}
 
-StatementNode::StatementNode( const string *name_ ) : ParseNode( name_ ), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {}
+StatementNode::StatementNode( const string *name ) : ParseNode( name ), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {}
 
 StatementNode::StatementNode( DeclarationNode *decl ) : type( Decl ), control( 0 ), block( 0 ), labels( 0 ), target( 0 ), isCatchRest ( false ) {
@@ -60 +60 @@
 }
 
-StatementNode::StatementNode( Type t, ExpressionNode *ctrl_label, StatementNode *block_ ) :
-                type( t ), control( ctrl_label ), block( block_), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {
-        if ( t == Default )
-                control = 0;
+StatementNode::StatementNode( Type t, ExpressionNode *ctrl_label, StatementNode *block ) : type( t ), control( ctrl_label ), block( block ), labels( 0 ), target( 0 ), decl( 0 ), isCatchRest ( false ) {
+        this->control = ( t == Default ) ? 0 : control;
 } 
 
-StatementNode::StatementNode( Type t, string *_target ) :
-                type( t ), control( 0 ), block( 0 ), labels( 0 ), target(_target ), decl( 0 ), isCatchRest ( false ) {}
+StatementNode::StatementNode( Type t, string *target ) : type( t ), control( 0 ), block( 0 ), labels( 0 ), target( target ), decl( 0 ), isCatchRest ( false ) {}
 
 StatementNode::~StatementNode() {
         delete control;
         delete block;
-        delete labels;
         delete target;
         delete decl;
@@ -103 +99 @@
 }
 
-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 ) {
         if ( control && e )
                 control->add_to_list( e ); // xxx - check this
-
         return this;
 }
@@ -170 +138 @@
 
 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
 
@@ -198 +164 @@
                         if ( decl ) {
                                 os << string( indent + ParseNode::indent_by, ' ' ) << "Declaration: " << endl;
-                                decl->print( os, indent + 2*ParseNode::indent_by );
+                                decl->print( os, indent + 2 * ParseNode::indent_by );
                         } else if ( isCatchRest ) {
                                 os << string( indent + ParseNode::indent_by, ' ' ) << "Catches the rest " << endl;
@@ -206 +172 @@
                 } // if
                 if ( control ) {
-                        os << string( indent + ParseNode::indent_by, ' ' ) << "Expression: " << endl;
-                        control->printList( os, indent + 2*ParseNode::indent_by );
+                        os << string( indent + ParseNode::indent_by, ' ' ) << "Control: " << endl;
+                        control->printList( os, indent + 2 * ParseNode::indent_by );
                 } // if
                 if ( block ) {
                         os << string( indent + ParseNode::indent_by, ' ' ) << "Branches of execution: " << endl;
-                        block->printList( os, indent + 2*ParseNode::indent_by );  
+                        block->printList( os, indent + 2 * ParseNode::indent_by );  
                 } // if
                 if ( target ) {
@@ -225 +191 @@
         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
 
@@ -274 +240 @@
                         if ( ctl->get_init() != 0 ) {
                                 buildList( ctl->get_init(), init );
-                        }
+                        } // if
 
                         Expression *cond = 0;
@@ -341 +307 @@
                         return new FinallyStmt( labs, block );
                 }
+          case Asm:
+                assert( false );
           default:
                 // shouldn't be here
@@ -346 +314 @@
         } // switch
 }
+
 
 CompoundStmtNode::CompoundStmtNode() : first( 0 ), last( 0 ) {}
@@ -378 +347 @@
 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
 
@@ -389 +358 @@
         return cs;
 }
+
+
+AsmStmtNode::AsmStmtNode( Type t, bool voltile, ConstantNode *instruction, ExpressionNode *output, ExpressionNode *input, ConstantNode *clobber, LabelNode *gotolabels ) :
+        StatementNode( t ), voltile( voltile ), instruction( instruction ), output( output ), input( input ), clobber( clobber ) {
+        if ( gotolabels ) {
+                this->gotolabels = gotolabels->get_labels();
+                delete gotolabels;
+        } // if
+}
+
+AsmStmtNode::~AsmStmtNode() {
+        delete instruction; delete output; delete input; delete clobber;
+}
+
+void AsmStmtNode::print( std::ostream &os, int indent ) const {
+        StatementNode::print( os, indent );                                     // print statement labels
+        os << string( indent + ParseNode::indent_by, ' ' ) << "volatile:" << voltile << endl;
+        if ( instruction ) {
+                os << string( indent + ParseNode::indent_by, ' ' ) << "Instruction:" << endl;
+                instruction->printList( os, indent + 2 * ParseNode::indent_by );
+        } // if
+        if ( output ) {
+                os << string( indent + ParseNode::indent_by, ' ' ) << "Output:" << endl;
+                output->printList( os, indent + 2 * ParseNode::indent_by );
+        } // if
+        if ( input ) {
+                os << string( indent + ParseNode::indent_by, ' ' ) << "Input:" << endl;
+                input->printList( os, indent + 2 * ParseNode::indent_by );
+        } // if
+        if ( clobber ) {
+                os << string( indent + ParseNode::indent_by, ' ' ) << "Clobber:" << endl;
+                clobber->printList( os, indent + 2 * ParseNode::indent_by );
+        } // if
+        if ( ! gotolabels.empty() ) {
+                os << string( indent + ParseNode::indent_by, ' ' ) << "Goto Labels:" << endl;
+                os << string( indent + 2 * ParseNode::indent_by, ' ' );
+                for ( std::list<std::string>::const_iterator i = gotolabels.begin();; ) {
+                        os << *i;
+                        i++;
+                  if ( i == gotolabels.end() ) break;
+                        os << ", ";
+                }
+                os << endl;
+        } // if
+}
+
+Statement *AsmStmtNode::build() const {
+        std::list<Label> labs;
+
+        if ( ! get_labels().empty() ) {
+                std::back_insert_iterator< std::list<Label> > lab_it( labs );
+                copy( get_labels().begin(), get_labels().end(), lab_it );
+        } // if
+
+        std::list< Expression * > out, in;
+        std::list< ConstantExpr * > clob;
+        buildList( output, out );
+        buildList( input, in );
+        buildList( clobber, clob );
+        std::list< Label > gotolabs = gotolabels;
+        return new AsmStmt( labs, voltile, (ConstantExpr *)maybeBuild< Expression >( instruction ), out, in, clob, gotolabs );
+}
+
 
 void NullStmtNode::print( ostream &os, int indent ) const {