Changes in src/CodeGen/CodeGenerator.cc [cda48b6:68cd1ce]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jun 11 13:22:39 2015
-// Update Count     : 137
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Jun 13 07:12:27 2015
+// Update Count     : 129
 //
 
@@ -19 +19 @@
 #include <list>
 
+#include "Parser/ParseNode.h"
+
 #include "SynTree/Type.h"
-#include "SynTree/Declaration.h"
-#include "SynTree/Statement.h"
 #include "SynTree/Expression.h"
 #include "SynTree/Initializer.h"
+#include "SynTree/Statement.h"
 
 #include "utility.h"
@@ -43 +44 @@
         }
 
-        ostream & CodeGenerator::Indenter::operator()( ostream & output ) {
-          return output << string( cg.cur_indent, ' ' );
-        }
-
-        ostream & operator<<( ostream & output, CodeGenerator::Indenter &indent ) {
-                return indent( output );
-        }
-
-        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 ) {
+        CodeGenerator::CodeGenerator( std::ostream &os ) : cur_indent( 0 ), insideFunction( false ), output( os ) { }
+
+        CodeGenerator::CodeGenerator( std::ostream &os, std::string init, int indent, bool infunp )
+                        : cur_indent( indent ), 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 ) {
+        CodeGenerator::CodeGenerator( std::ostream &os, char *init, int indent, bool infunp )
+                        : cur_indent( indent ), insideFunction( infunp ), output( os ) {
                 //output << std::string( init );
         }
@@ -70 +63 @@
                 } // if
         }
- 
+  
         //*** Declarations
         void CodeGenerator::visit( FunctionDecl *functionDecl ) {
@@ -112 +105 @@
 
                 if ( ! memb.empty() ) {
-                        output << endl << indent << "{" << endl;
+                        output << endl << string( cur_indent, ' ' ) << "{" << endl;
 
                         cur_indent += CodeGenerator::tabsize; 
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end();  i++) {
-                                output << indent; 
+                                output << string( cur_indent, ' ' ); 
                                 (*i)->accept(*this );
                                 output << ";" << endl;
@@ -123 +116 @@
                         cur_indent -= CodeGenerator::tabsize; 
 
-                        output << indent << "}";
+                        output << string( cur_indent, ' ' ) << "}";
                 } // if
         }
@@ -146 +139 @@
 
                 if ( ! memb.empty() ) {
-                        output << " {" << endl;
+                        output << endl << "{" << endl;
 
                         cur_indent += CodeGenerator::tabsize; 
@@ -152 +145 @@
                                 ObjectDecl *obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << indent << mangleName( obj ); 
+                                output << string( cur_indent, ' ' ) << mangleName( obj ); 
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -162 +155 @@
                         cur_indent -= CodeGenerator::tabsize; 
 
-                        output << indent << "}";
+                        output << "}" << endl;
                 } // if
         }
@@ -452 +445 @@
 
                 for ( std::list<Statement *>::iterator i = ks.begin(); i != ks.end();  i++) {
-                        output << indent << printLabels( (*i)->get_labels() );
+                        output << string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() );
                         (*i)->accept(*this );
 
@@ -462 +455 @@
                 cur_indent -= CodeGenerator::tabsize; 
 
-                output << indent << "}";
+                output << string( cur_indent, ' ' ) << "}";
         }
 
@@ -502 +495 @@
                 cur_indent -= CodeGenerator::tabsize;
 
-                output << indent << "}";
+                output << string( cur_indent, ' ' ) << "}";
         }
 
         void CodeGenerator::visit( CaseStmt *caseStmt ) {
-                output << indent;
+                output << string( cur_indent, ' ' );
                 if ( caseStmt->isDefault()) {
                         output << "default";
@@ -519 +512 @@
                 cur_indent += CodeGenerator::tabsize;
                 for ( std::list<Statement *>::iterator i = sts.begin(); i != sts.end();  i++) {
-                        output << indent << printLabels( (*i)->get_labels() )  ;
+                        output << string( cur_indent, ' ' ) << printLabels( (*i)->get_labels() )  ;
                         (*i)->accept(*this );
                         output << endl;
@@ -572 +565 @@
                 whileStmt->get_body()->accept( *this );
 
-                output << indent;
+                output << string( cur_indent, ' ' );
 
                 if ( whileStmt->get_isDoWhile() ) {
@@ -604 +597 @@
 
         void CodeGenerator::visit( NullStmt *nullStmt ) {
-                //output << indent << CodeGenerator::printLabels( nullStmt->get_labels() );
+                //output << string( cur_indent, ' ' ) << CodeGenerator::printLabels( nullStmt->get_labels() );
                 output << "/* null statement */ ;";
         }
@@ -628 +621 @@
         void CodeGenerator::handleStorageClass( Declaration *decl ) {
                 switch ( decl->get_storageClass() ) {
-                  case Declaration::NoStorageClass:
-                        break;
-                  case Declaration::Extern:
+                  case DeclarationNode::Extern:
                         output << "extern ";
                         break;
-                  case Declaration::Static:
+                  case DeclarationNode::Static:
                         output << "static ";
                         break;
-                  case Declaration::Auto:
+                  case DeclarationNode::Auto:
                         // silently drop storage class
                         break;
-                  case Declaration::Register:
+                  case DeclarationNode::Register:
                         output << "register ";
                         break;
-                  case Declaration::Inline:
+                  case DeclarationNode::Inline:
                         // handled as special via isInline flag (FIX)
                         break;
-                  case Declaration::Fortran:
+                  case DeclarationNode::Fortran:
                         // not handled
+                        output << "fortran ";
+                        break;
+                  case DeclarationNode::Noreturn:
+                        // not handled
+                        output << "_Noreturn ";
+                        break;
+                  case DeclarationNode::Threadlocal:
+                        // not handled
+                        output << "_Thread_local ";
+                        break;
+                  case DeclarationNode::NoStorageClass:
                         break;
                 } // switch