Changes in src/CodeGen/CodeGenerator.cc [fbcde64:5f642e38]

File:

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

src/CodeGen/CodeGenerator.cc

@@ -89 +89 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ) {}
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ) {}
 
         CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
@@ -136 +136 @@
                 functionDecl->get_funcSpec().print( output );
 
-                output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), pretty );
+                output << genType( functionDecl->get_functionType(), mangleName( functionDecl ), pretty, genC );
 
                 asmName( functionDecl );
@@ -147 +147 @@
 
         void CodeGenerator::visit( ObjectDecl * objectDecl ) {
-                if (objectDecl->get_name().empty()) {
+                if (objectDecl->get_name().empty() && genC ) {
+                        // only generate an anonymous name when generating C code, otherwise it clutters the output too much
                         static UniqueName name = { "__anonymous_object" };
                         objectDecl->set_name( name.newName() );
@@ -156 +157 @@
 
                 handleStorageClass( objectDecl );
-                output << genType( objectDecl->get_type(), mangleName( objectDecl ), pretty );
+                output << genType( objectDecl->get_type(), mangleName( objectDecl ), pretty, genC );
 
                 asmName( objectDecl );
@@ -171 +172 @@
         }
 
-        void CodeGenerator::handleAggregate( AggregateDecl * aggDecl ) {
+        void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
                 genAttributes( aggDecl->get_attributes() );
 
+                if( ! aggDecl->get_parameters().empty() && ! genC ) {
+                        // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
+                        output << "forall(";
+                        genCommaList( aggDecl->get_parameters().begin(), aggDecl->get_parameters().end() );
+                        output << ")" << endl;
+                }
+
+                output << kind;
                 if ( aggDecl->get_name() != "" )
                         output << aggDecl->get_name();
 
-                // std::list< Declaration * > & memb = aggDecl->get_members();
-                // if ( ! memb.empty() ) {
                 if ( aggDecl->has_body() ) {
                         std::list< Declaration * > & memb = aggDecl->get_members();
@@ -198 +205 @@
         void CodeGenerator::visit( StructDecl * structDecl ) {
                 extension( structDecl );
-                output << "struct ";
-                handleAggregate( structDecl );
+                handleAggregate( structDecl, "struct " );
         }
 
         void CodeGenerator::visit( UnionDecl * unionDecl ) {
                 extension( unionDecl );
-                output << "union ";
-                handleAggregate( unionDecl );
+                handleAggregate( unionDecl, "union " );
         }
 
@@ -242 +247 @@
 
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {
-                assert( false && "Typedefs are removed and substituted in earlier passes." );
-                //output << "typedef ";
-                //output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty );
+                assertf( ! genC, "Typedefs are removed and substituted in earlier passes." );
+                output << "typedef ";
+                output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty, genC ) << endl;
         }
 
         void CodeGenerator::visit( TypeDecl * typeDecl ) {
-                // really, we should mutate this into something that isn't a TypeDecl but that requires large-scale changes,
-                // still to be done
-                extension( typeDecl );
-                output << "extern unsigned long " << typeDecl->get_name();
-                if ( typeDecl->get_base() ) {
-                        output << " = sizeof( " << genType( typeDecl->get_base(), "", pretty ) << " )";
-                } // if
+                if ( genC ) {
+                        // really, we should mutate this into something that isn't a TypeDecl but that requires large-scale changes,
+                        // still to be done
+                        extension( typeDecl );
+                        output << "extern unsigned long " << typeDecl->get_name();
+                        if ( typeDecl->get_base() ) {
+                                output << " = sizeof( " << genType( typeDecl->get_base(), "", pretty, genC ) << " )";
+                        } // if
+                } else {
+                        output << typeDecl->typeString() << " " << typeDecl->get_name();
+                        if ( ! typeDecl->get_assertions().empty() ) {
+                                output << " | { ";
+                                genCommaList( typeDecl->get_assertions().begin(), typeDecl->get_assertions().end() );
+                                output << " }";
+                        }
+                }
         }
 
@@ -293 +307 @@
 
         void CodeGenerator::visit( ConstructorInit * init ){
-                assertf( false, "ConstructorInit nodes should not make it to CodeGen." );
+                assertf( ! genC, "ConstructorInit nodes should not reach code generation." );
+                // xxx - generate something reasonable for constructor/destructor pairs
+                output << "<ctorinit>";
         }
 
@@ -547 +563 @@
                         // at least one result type of cast, but not an lvalue
                         output << "(";
-                        output << genType( castExpr->get_result(), "", pretty );
+                        output << genType( castExpr->get_result(), "", pretty, genC );
                         output << ")";
                 } else {
@@ -558 +574 @@
 
         void CodeGenerator::visit( UntypedMemberExpr * memberExpr ) {
-                assert( false );
+                assertf( ! genC, "UntypedMemberExpr should not reach code generation." );
+                extension( memberExpr );
+                memberExpr->get_aggregate()->accept( *this );
+                output << ".";
+                memberExpr->get_member()->accept( *this );
         }
 
@@ -587 +607 @@
                 output << "sizeof(";
                 if ( sizeofExpr->get_isType() ) {
-                        output << genType( sizeofExpr->get_type(), "", pretty );
+                        output << genType( sizeofExpr->get_type(), "", pretty, genC );
                 } else {
                         sizeofExpr->get_expr()->accept( *this );
@@ -599 +619 @@
                 output << "__alignof__(";
                 if ( alignofExpr->get_isType() ) {
-                        output << genType( alignofExpr->get_type(), "", pretty );
+                        output << genType( alignofExpr->get_type(), "", pretty, genC );
                 } else {
                         alignofExpr->get_expr()->accept( *this );
@@ -607 +627 @@
 
         void CodeGenerator::visit( UntypedOffsetofExpr * offsetofExpr ) {
-                assert( false && "UntypedOffsetofExpr should not reach code generation." );
+                assertf( ! genC, "UntypedOffsetofExpr should not reach code generation." );
+                output << "offsetof(";
+                output << genType( offsetofExpr->get_type(), "", pretty, genC );
+                output << ", " << offsetofExpr->get_member();
+                output << ")";
         }
 
@@ -613 +637 @@
                 // use GCC builtin
                 output << "__builtin_offsetof(";
-                output << genType( offsetofExpr->get_type(), "", pretty );
+                output << genType( offsetofExpr->get_type(), "", pretty, genC );
                 output << ", " << mangleName( offsetofExpr->get_member() );
                 output << ")";
@@ -619 +643 @@
 
         void CodeGenerator::visit( OffsetPackExpr * offsetPackExpr ) {
-                assert( false && "OffsetPackExpr should not reach code generation." );
+                assertf( ! genC, "OffsetPackExpr should not reach code generation." );
+                output << "__CFA_offsetpack(" << genType( offsetPackExpr->get_type(), "", pretty, genC ) << ")";
         }
 
@@ -655 +680 @@
         }
 
-        void CodeGenerator::visit( UntypedTupleExpr * tupleExpr ) { assertf( false, "UntypedTupleExpr should not make it to Code Gen" ); }
-
-        void CodeGenerator::visit( TupleExpr * tupleExpr ) { assertf( false, "TupleExpr should not make it to Code Gen" ); }
-
-        void CodeGenerator::visit( TypeExpr * typeExpr ) {}
+        void CodeGenerator::visit( UntypedTupleExpr * tupleExpr ) {
+                assertf( ! genC, "UntypedTupleExpr should not reach code generation." );
+                output << "[";
+                genCommaList( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end() );
+                output << "]";
+        }
+
+        void CodeGenerator::visit( TupleExpr * tupleExpr ) {
+                assertf( ! genC, "TupleExpr should not reach code generation." );
+                output << "[";
+                genCommaList( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end() );
+                output << "]";
+        }
+
+        void CodeGenerator::visit( TypeExpr * typeExpr ) {
+                assertf( ! genC, "TypeExpr should not reach code generation." );
+                output<< genType( typeExpr->get_type(), "", pretty, genC );
+        }
 
         void CodeGenerator::visit( AsmExpr * asmExpr ) {
@@ -675 +713 @@
         void CodeGenerator::visit( CompoundLiteralExpr *compLitExpr ) {
                 assert( compLitExpr->get_result() && dynamic_cast< ListInit * > ( compLitExpr->get_initializer() ) );
-                output << "(" << genType( compLitExpr->get_result(), "", pretty ) << ")";
+                output << "(" << genType( compLitExpr->get_result(), "", pretty, genC ) << ")";
                 compLitExpr->get_initializer()->accept( *this );
         }