Changeset 777ed2b for src/CodeGen

Timestamp:

Jul 11, 2018, 11:55:59 AM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

0fc52b6

Parents:

fc20514 (diff), 7de22b28 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

fix conflicts

Location:

src/CodeGen

Files:

• CodeGenerator.cc (modified) (3 diffs)
• GenType.cc (modified) (3 diffs)

src/CodeGen/CodeGenerator.cc

@@ -164 +164 @@
                 previsit( (BaseSyntaxNode *)node );
                 GuardAction( [this, node](){
-                        if ( printExprTypes ) {
+                        if ( printExprTypes && node->result ) {
                                 output << " /* " << genType( node->result, "", pretty, genC ) << " */ ";
                         }
@@ -224 +224 @@
 
         void CodeGenerator::handleAggregate( AggregateDecl * aggDecl, const std::string & kind ) {
-                if( ! aggDecl->get_parameters().empty() && ! genC ) {
+                if( ! aggDecl->parameters.empty() && ! genC ) {
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         output << "forall(";
-                        genCommaList( aggDecl->get_parameters().begin(), aggDecl->get_parameters().end() );
+                        genCommaList( aggDecl->parameters.begin(), aggDecl->parameters.end() );
                         output << ")" << endl;
                         output << indent;
@@ -233 +233 @@
 
                 output << kind;
-                genAttributes( aggDecl->get_attributes() );
-                output << aggDecl->get_name();
+                genAttributes( aggDecl->attributes );
+                output << aggDecl->name;
 
                 if ( aggDecl->has_body() ) {
-                        std::list< Declaration * > & memb = aggDecl->get_members();
+                        std::list< Declaration * > & memb = aggDecl->members;
                         output << " {" << endl;
 

src/CodeGen/GenType.cc

@@ -48 +48 @@
                 void postvisit( ZeroType * zeroType );
                 void postvisit( OneType * oneType );
+                void postvisit( GlobalScopeType * globalType );
                 void postvisit( TraitInstType * inst );
                 void postvisit( TypeofType * typeof );
+                void postvisit( QualifiedType * qualType );
 
           private:
@@ -291 +293 @@
         }
 
+        void GenType::postvisit( GlobalScopeType * globalType ) {
+                assertf( ! genC, "Global scope type should not reach code generation." );
+                handleQualifiers( globalType );
+        }
+
         void GenType::postvisit( TraitInstType * inst ) {
                 assertf( ! genC, "Trait types should not reach code generation." );
@@ -307 +314 @@
         }
 
+        void GenType::postvisit( QualifiedType * qualType ) {
+                assertf( ! genC, "Qualified types should not reach code generation." );
+                std::ostringstream os;
+                os << genType( qualType->parent, "", pretty, genC, lineMarks ) << "." << genType( qualType->child, "", pretty, genC, lineMarks ) << typeString;
+                typeString = os.str();
+                handleQualifiers( qualType );
+        }
+
         void GenType::handleQualifiers( Type * type ) {
                 if ( type->get_const() ) {