Changeset 5f642e38 for src

Timestamp:

Apr 19, 2017, 12:08:40 PM (7 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:

e3987770

Parents:

7069652

Message:

more work on codegen output

Location:

src/CodeGen

Files:

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

src/CodeGen/CodeGenerator.cc

@@ -172 +172 @@
         }
 
-        void CodeGenerator::handleAggregate( AggregateDecl * aggDecl ) {
+        void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
                 genAttributes( aggDecl->get_attributes() );
 
@@ -182 +182 @@
                 }
 
+                output << kind;
                 if ( aggDecl->get_name() != "" )
                         output << aggDecl->get_name();
@@ -204 +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 " );
         }
 
@@ -578 +577 @@
                 extension( memberExpr );
                 memberExpr->get_aggregate()->accept( *this );
-                output << "." << memberExpr->get_member();
+                output << ".";
+                memberExpr->get_member()->accept( *this );
         }
 

src/CodeGen/CodeGenerator.h

@@ -125 +125 @@
                 void printDesignators( std::list< Expression * > & );
                 void handleStorageClass( DeclarationWithType *decl );
-                void handleAggregate( AggregateDecl *aggDecl );
+                void handleAggregate( AggregateDecl *aggDecl, const std::string & kind );
                 void handleTypedef( NamedTypeDecl *namedType );
                 std::string mangleName( DeclarationWithType * decl );

src/CodeGen/GenType.cc

@@ -186 +186 @@
                         funcType->get_returnVals().front()->get_type()->accept( *this );
                 } // if
+
+                // add forall
+                if( ! funcType->get_forall().empty() && ! genC ) {
+                        // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
+                        std::ostringstream os;
+                        CodeGenerator cg( os, pretty, genC );
+                        os << "forall(";
+                        cg.genCommaList( funcType->get_forall().begin(), funcType->get_forall().end() );
+                        os << ")" << std::endl;
+                        typeString = os.str() + typeString;
+                }
         }