Changeset 23b6643f for src/CodeGen

Timestamp:

Sep 20, 2016, 4:47:34 PM (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:

1132b62

Parents:

aefcc3b (diff), db46512 (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 tuples

Conflicts:

src/Makefile.in
src/ResolvExpr/Unify.cc
src/SynTree/Type.h

File:

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

src/CodeGen/GenType.cc

@@ -42 +42 @@
                 virtual void visit( TypeInstType *typeInst );
                 virtual void visit( VarArgsType *varArgsType );
+                virtual void visit( ZeroType *zeroType );
+                virtual void visit( OneType *oneType );
 
           private:
@@ -200 +202 @@
         }
 
+        void GenType::visit( ZeroType *zeroType ) {
+                // ideally these wouldn't hit codegen at all, but should be safe to make them ints
+                typeString = "int " + typeString;
+                handleQualifiers( zeroType );
+        }
+
+        void GenType::visit( OneType *oneType ) {
+                // ideally these wouldn't hit codegen at all, but should be safe to make them ints
+                typeString = "int " + typeString;
+                handleQualifiers( oneType );
+        }
+
         void GenType::handleQualifiers( Type *type ) {
                 if ( type->get_isConst() ) {