Changes in src/CodeGen/CodeGenerator.cc [7f5566b:e45215c]

File:

• src/CodeGen/CodeGenerator.cc (modified) (13 diffs)

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 27 14:40:06 2015
-// Update Count     : 218
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Jul 15 14:47:42 2015
+// Update Count     : 177
 //
 
@@ -52 +52 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream &os ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ) { }
+        CodeGenerator::CodeGenerator( std::ostream &os ) : indent(*this), cur_indent( 0 ), insideFunction( false ), output( os ) { }
 
         CodeGenerator::CodeGenerator( std::ostream &os, std::string init, int indentation, bool infunp )
-                        : indent( *this), cur_indent( indentation ), insideFunction( infunp ), output( os ) {
+                        : indent(*this), cur_indent( indentation ), insideFunction( infunp ), output( os ) {
                 //output << std::string( init );
         }
 
         CodeGenerator::CodeGenerator( std::ostream &os, char *init, int indentation, bool infunp )
-                        : indent( *this ), cur_indent( indentation ), insideFunction( infunp ), output( os ) {
+                        : indent(*this), cur_indent( indentation ), insideFunction( infunp ), output( os ) {
                 //output << std::string( init );
         }
@@ -91 +91 @@
                 // acceptAll( functionDecl->get_oldDecls(), *this );
                 if ( functionDecl->get_statements() ) {
-                        functionDecl->get_statements()->accept( *this );
+                        functionDecl->get_statements()->accept(*this );
                 } // if
         }
@@ -121 +121 @@
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
                                 output << indent; 
-                                (*i)->accept( *this );
+                                (*i)->accept(*this );
                                 output << ";" << endl;
                         }
@@ -159 +159 @@
                                 if ( obj->get_init() ) {
                                         output << " = ";
-                                        obj->get_init()->accept( *this );
+                                        obj->get_init()->accept(*this );
                                 } // if
                                 output << "," << endl;
@@ -186 +186 @@
         }
 
+        void CodeGenerator::printDesignators( std::list< Expression * > & designators ) {
+                typedef std::list< Expression * > DesignatorList;
+                if ( designators.size() == 0 ) return;
+                for ( DesignatorList::iterator iter = designators.begin(); iter != designators.end(); ++iter ) {
+                        // if expression is a name, then initializing aggregate member, if constant expression then array
+                        if ( NameExpr * nm = dynamic_cast< NameExpr * >( *iter ) ) {
+                                if ( nm->get_name() == "0" || nm->get_name() == "1" ) {
+                                        // except if name is 0 or 1...
+                                        output << "[";
+                                        nm->accept( *this );
+                                        output << "]";
+                                } else {
+                                        output << ".";
+                                        nm->accept( *this );
+                                }
+                        } else if ( dynamic_cast< ConstantExpr * >( *iter ) ) {
+                                output << "[";
+                                (*iter)->accept( *this );
+                                output << "]";
+                        } else {
+                                assert(0);
+                        }
+                }
+                output << " = ";
+        }
+
         void CodeGenerator::visit( SingleInit *init ) {
+                printDesignators( init->get_designators() );
                 init->get_value()->accept( *this );
         }
 
         void CodeGenerator::visit( ListInit *init ) {
+                printDesignators( init->get_designators() );
                 output << "{ ";
                 genCommaList( init->begin_initializers(), init->end_initializers() );
@@ -450 +478 @@
         void CodeGenerator::visit( TypeExpr *typeExpr ) {}
 
-        void CodeGenerator::visit( AsmExpr *asmExpr ) {
-                if ( asmExpr->get_inout() ) {
-                        output << "[ ";
-                        asmExpr->get_inout()->accept( *this );
-                        output << " ] ";
-                } // if
-                asmExpr->get_constraint()->accept( *this );
-                output << " ( ";
-                asmExpr->get_operand()->accept( *this );
-                output << " )";
-        }
-
         //*** Statements
         void CodeGenerator::visit( CompoundStmt *compoundStmt ) {
@@ -469 +485 @@
                 cur_indent += CodeGenerator::tabsize;
 
-                for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++ ) {
+                for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++) {
                         output << indent << printLabels( (*i)->get_labels() );
-                        (*i)->accept( *this );
+                        (*i)->accept(*this );
 
                         output << endl;
@@ -495 +511 @@
         }
 
-        void CodeGenerator::visit( AsmStmt *asmStmt ) {
-                output << "asm ";
-                if ( asmStmt->get_voltile() ) output << "volatile ";
-                if ( ! asmStmt->get_gotolabels().empty()  ) output << "goto ";
-                output << "( ";
-                if ( asmStmt->get_instruction() ) asmStmt->get_instruction()->accept( *this );
-                output << " : ";
-                genCommaList( asmStmt->get_output().begin(), asmStmt->get_output().end() );
-                output << " : ";
-                genCommaList( asmStmt->get_input().begin(), asmStmt->get_input().end() );
-                output << " : ";
-                genCommaList( asmStmt->get_clobber().begin(), asmStmt->get_clobber().end() );
-                if ( ! asmStmt->get_gotolabels().empty() ) {
-                        output << " : ";
-                        for ( std::list<Label>::iterator begin = asmStmt->get_gotolabels().begin();; ) {
-                                output << *begin++;
-                                if ( begin == asmStmt->get_gotolabels().end() ) break;
-                                output << ", ";
-                        } // for
-                } // if
-                output << " );" ;
-        }
-
         void CodeGenerator::visit( IfStmt *ifStmt ) {
-                output << "if ( ";
-                ifStmt->get_condition()->accept( *this );
-                output << " ) ";
-
-                ifStmt->get_thenPart()->accept( *this );
+                output << "if (";
+                ifStmt->get_condition()->accept(*this );
+                output << ") ";
+
+                ifStmt->get_thenPart()->accept(*this );
 
                 if ( ifStmt->get_elsePart() != 0) {
                         output << " else ";
-                        ifStmt->get_elsePart()->accept( *this );
+                        ifStmt->get_elsePart()->accept(*this );
                 } // if
         }
 
         void CodeGenerator::visit( SwitchStmt *switchStmt ) {
-                output << "switch ( " ;
-                switchStmt->get_condition()->accept( *this );
-                output << " ) ";
+                output << "switch (" ;
+                switchStmt->get_condition()->accept(*this );
+                output << ") ";
                 
                 output << "{" << std::endl;
@@ -552 +545 @@
                 } else {
                         output << "case ";
-                        caseStmt->get_condition()->accept( *this );
+                        caseStmt->get_condition()->accept(*this );
                 } // if
                 output << ":\n";
@@ -561 +554 @@
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
                         output << indent << printLabels( (*i)->get_labels() )  ;
-                        (*i)->accept( *this );
+                        (*i)->accept(*this );
                         output << endl;
                 }
@@ -605 +598 @@
                 else {
                         output << "while (" ;
-                        whileStmt->get_condition()->accept( *this );
+                        whileStmt->get_condition()->accept(*this );
                         output << ")";
                 } // if
@@ -617 +610 @@
                 if ( whileStmt->get_isDoWhile() ) {
                         output << " while (" ;
-                        whileStmt->get_condition()->accept( *this );
+                        whileStmt->get_condition()->accept(*this );
                         output << ");";
                 } // if