diff gen/complex.cpp @ 586:192b82878b78

Fixed most regressions from last commit.
author Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>
date Wed, 10 Sep 2008 12:33:33 -0700
parents fbb1a366cfbc
children 634fbbdec390
line wrap: on
line diff
--- a/gen/complex.cpp	Tue Sep 09 16:49:47 2008 -0700
+++ b/gen/complex.cpp	Wed Sep 10 12:33:33 2008 -0700
@@ -119,9 +119,12 @@
     if (t->isimaginary()) {
         res = DtoAggrPair(complexTy, LLConstant::getNullValue(DtoType(baserety)), DtoCastFloat(loc, val, baseimty)->getRVal());
     }
-    else if (t->isfloating() || t->isintegral()) {
+    else if (t->isfloating()) {
         res = DtoAggrPair(complexTy, DtoCastFloat(loc, val, baserety)->getRVal(), LLConstant::getNullValue(DtoType(baseimty)));
     }
+    else if (t->isintegral()) {
+        res = DtoAggrPair(complexTy, DtoCastInt(loc, val, baserety)->getRVal(), LLConstant::getNullValue(DtoType(baseimty)));
+    }
     else {
         assert(0);
     }