Changeset f678663e for src/Parser/StatementNode.cc

Timestamp:

Jul 30, 2015, 4:08:34 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

8c84ebd, ae4c85a

Parents:

5aa708c (diff), 093f1a0 (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 /u/cforall/software/cfa/cfa-cc

Conflicts:

src/main.cc

File:

• src/Parser/StatementNode.cc (modified) (10 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 : Thu Jul 16 16:20:24 2015
-// Update Count     : 30
+// 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() {
@@ -113 +110 @@
         if ( control && e )
                 control->add_to_list( e ); // xxx - check this
-
         return this;
 }
@@ -142 +138 @@
 
 void StatementNode::print( std::ostream &os, int indent ) const {
-        if ( ! labels.empty()) {
+        if ( ! labels.empty() ) {
                 std::list<std::string>::const_iterator i;
 
@@ -168 +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;
@@ -176 +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 ) {
@@ -311 +307 @@
                         return new FinallyStmt( labs, block );
                 }
+          case Asm:
+                assert( false );
           default:
                 // shouldn't be here
@@ -316 +314 @@
         } // switch
 }
+
 
 CompoundStmtNode::CompoundStmtNode() : first( 0 ), last( 0 ) {}
@@ -360 +359 @@
 }
 
+
+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 {
         os << string( indent, ' ' ) << "Null Statement:" << endl;