Changeset 3c13c03 for src/CodeGen

Timestamp:

Sep 17, 2016, 8:27:51 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

8c49c0e

Parents:

12bc63a

Message:

expand TupleExpr? and TupleIndexExpr?, add UniqueExpr?

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (2 diffs)
• CodeGenerator.h (modified) (1 diff)
• GenType.cc (modified) (1 diff)

src/CodeGen/CodeGenerator.cc

@@ -639 +639 @@
         }
 
-        void CodeGenerator::visit( TupleExpr * tupleExpr ) {}
+        void CodeGenerator::visit( TupleExpr * tupleExpr ) { assert( false ); }
 
         void CodeGenerator::visit( TypeExpr * typeExpr ) {}
@@ -655 +655 @@
         }
 
+        void CodeGenerator::visit( CompoundLiteralExpr *compLitExpr ) {
+                assert( compLitExpr->get_type() && dynamic_cast< ListInit * > ( compLitExpr->get_initializer() ) );
+                output << "(" << genType( compLitExpr->get_type(), "" ) << ")";
+                compLitExpr->get_initializer()->accept( *this );
+        }
+
         void CodeGenerator::visit( StmtExpr * stmtExpr ) {
-                output << "(";
-                stmtExpr->get_statements()->accept( *this );
-                output << ")";
+                std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
+                output << "({" << std::endl;
+                cur_indent += CodeGenerator::tabsize;
+                unsigned int numStmts = stmts.size();
+                unsigned int i = 0;
+                for ( Statement * stmt : stmts ) {
+                        output << indent << printLabels( stmt->get_labels() );
+                        if ( i+1 == numStmts ) {
+                                // last statement in a statement expression needs to be handled specially -
+                                // cannot cast to void, otherwise the expression statement has no value
+                                if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( stmt ) ) {
+                                        exprStmt->get_expr()->accept( *this );
+                                        output << ";" << endl;
+                                        ++i;
+                                        break;
+                                }
+                        }
+                        stmt->accept( *this );
+                        output << endl;
+                        if ( wantSpacing( stmt ) ) {
+                                output << endl;
+                        } // if
+                        ++i;
+                }
+                cur_indent -= CodeGenerator::tabsize;
+                output << indent << "})";
         }
 

src/CodeGen/CodeGenerator.h

@@ -70 +70 @@
                 virtual void visit( ConditionalExpr *conditionalExpr );
                 virtual void visit( CommaExpr *commaExpr );
+                virtual void visit( CompoundLiteralExpr *compLitExpr );
                 virtual void visit( TupleExpr *tupleExpr );
                 virtual void visit( TypeExpr *typeExpr );

src/CodeGen/GenType.cc

@@ -213 +213 @@
                         typeString = "_Atomic " + typeString;
                 } // if
-                if ( type->get_isAttribute() ) {
-                        typeString = "__attribute(( )) " + typeString;
-                } // if
         }
 } // namespace CodeGen