Changeset da7fe39 for src/CodeGen/GenType.cc

Timestamp:

Apr 23, 2018, 12:57:46 PM (6 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, with_gc

Children:

57acae0

Parents:

ba89e9b7 (diff), c8ad5d9 (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:

Merge branch 'master' into references

File:

• src/CodeGen/GenType.cc (modified) (2 diffs)

src/CodeGen/GenType.cc

@@ -48 +48 @@
                 void postvisit( ZeroType * zeroType );
                 void postvisit( OneType * oneType );
+                void postvisit( TraitInstType * inst );
+                void postvisit( TypeofType * typeof );
 
           private:
@@ -289 +291 @@
         }
 
+        void GenType::postvisit( TraitInstType * inst ) {
+                assertf( ! genC, "Trait types should not reach code generation." );
+                typeString = inst->name + " " + typeString;
+                handleQualifiers( inst );
+        }
+
+        void GenType::postvisit( TypeofType * typeof ) {
+                std::ostringstream os;
+                PassVisitor<CodeGenerator> cg( os, pretty, genC, lineMarks );
+                os << "typeof(";
+                typeof->expr->accept( cg );
+                os << ") " << typeString;
+                typeString = os.str();
+                handleQualifiers( typeof );
+        }
+
         void GenType::handleQualifiers( Type * type ) {
                 if ( type->get_const() ) {