Mercurial > projects > ldc

diff gen/complex.cpp @ 399:0e6b4d65d3f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Give error messages for invalid casts. This required passing Loc information to certain functions. Fixes nocompile/b/bug_cgcs_354_A/B.
author Christian Kamm <kamm incasoftware de>
date Sat, 26 Jul 2008 17:19:16 +0200
parents 8014dbd24605
children 798ee94a0be7
line wrap: on
line diff
--- a/gen/complex.cpp	Sat Jul 26 15:42:05 2008 +0200
+++ b/gen/complex.cpp	Sat Jul 26 17:19:16 2008 +0200
@@ -101,12 +101,12 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-DValue* DtoComplex(Type* to, DValue* val)
+DValue* DtoComplex(Loc& loc, Type* to, DValue* val)
 {
     Type* t = DtoDType(val->getType());
 
     if (val->isComplex() || t->iscomplex()) {
-        return DtoCastComplex(val, to);
+        return DtoCastComplex(loc, val, to);
     }
 
     const LLType* base = DtoComplexBaseType(to);
@@ -126,13 +126,13 @@
     }
 
     if (t->isimaginary()) {
-        return new DComplexValue(to, LLConstant::getNullValue(DtoType(baserety)), DtoCastFloat(val, baseimty)->getRVal());
+        return new DComplexValue(to, LLConstant::getNullValue(DtoType(baserety)), DtoCastFloat(loc, val, baseimty)->getRVal());
     }
     else if (t->isfloating()) {
-        return new DComplexValue(to, DtoCastFloat(val, baserety)->getRVal(), LLConstant::getNullValue(DtoType(baseimty)));
+        return new DComplexValue(to, DtoCastFloat(loc, val, baserety)->getRVal(), LLConstant::getNullValue(DtoType(baseimty)));
     }
     else if (t->isintegral()) {
-        return new DComplexValue(to, DtoCastInt(val, baserety)->getRVal(), LLConstant::getNullValue(DtoType(baseimty)));
+        return new DComplexValue(to, DtoCastInt(loc, val, baserety)->getRVal(), LLConstant::getNullValue(DtoType(baseimty)));
     }
     assert(0);
 }
@@ -179,10 +179,10 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-DValue* DtoComplexAdd(Type* type, DValue* lhs, DValue* rhs)
+DValue* DtoComplexAdd(Loc& loc, Type* type, DValue* lhs, DValue* rhs)
 {
-    lhs = DtoComplex(type, resolveLR(lhs, true));
-    rhs = DtoComplex(type, resolveLR(rhs, false));
+    lhs = DtoComplex(loc, type, resolveLR(lhs, true));
+    rhs = DtoComplex(loc, type, resolveLR(rhs, false));
 
     llvm::Value *a, *b, *c, *d, *re, *im;
 
@@ -200,10 +200,10 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-DValue* DtoComplexSub(Type* type, DValue* lhs, DValue* rhs)
+DValue* DtoComplexSub(Loc& loc, Type* type, DValue* lhs, DValue* rhs)
 {
-    lhs = DtoComplex(type, resolveLR(lhs, true));
-    rhs = DtoComplex(type, resolveLR(rhs, false));
+    lhs = DtoComplex(loc, type, resolveLR(lhs, true));
+    rhs = DtoComplex(loc, type, resolveLR(rhs, false));
 
     llvm::Value *a, *b, *c, *d, *re, *im;
 
@@ -221,10 +221,10 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-DValue* DtoComplexMul(Type* type, DValue* lhs, DValue* rhs)
+DValue* DtoComplexMul(Loc& loc, Type* type, DValue* lhs, DValue* rhs)
 {
-    lhs = DtoComplex(type, resolveLR(lhs, true));
-    rhs = DtoComplex(type, resolveLR(rhs, false));
+    lhs = DtoComplex(loc, type, resolveLR(lhs, true));
+    rhs = DtoComplex(loc, type, resolveLR(rhs, false));
 
     llvm::Value *a, *b, *c, *d;
 
@@ -248,10 +248,10 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-DValue* DtoComplexDiv(Type* type, DValue* lhs, DValue* rhs)
+DValue* DtoComplexDiv(Loc& loc, Type* type, DValue* lhs, DValue* rhs)
 {
-    lhs = DtoComplex(type, resolveLR(lhs, true));
-    rhs = DtoComplex(type, resolveLR(rhs, false));
+    lhs = DtoComplex(loc, type, resolveLR(lhs, true));
+    rhs = DtoComplex(loc, type, resolveLR(rhs, false));
 
     llvm::Value *a, *b, *c, *d;
 
@@ -281,9 +281,9 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-DValue* DtoComplexNeg(Type* type, DValue* val)
+DValue* DtoComplexNeg(Loc& loc, Type* type, DValue* val)
 {
-    val = DtoComplex(type, resolveLR(val, false));
+    val = DtoComplex(loc, type, resolveLR(val, false));
 
     llvm::Value *a, *b, *re, *im;
 
@@ -299,12 +299,12 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-LLValue* DtoComplexEquals(TOK op, DValue* lhs, DValue* rhs)
+LLValue* DtoComplexEquals(Loc& loc, TOK op, DValue* lhs, DValue* rhs)
 {
     Type* type = lhs->getType();
 
-    lhs = DtoComplex(type, resolveLR(lhs, false));
-    rhs = DtoComplex(type, resolveLR(rhs, false));
+    lhs = DtoComplex(loc, type, resolveLR(lhs, false));
+    rhs = DtoComplex(loc, type, resolveLR(rhs, false));
 
     llvm::Value *a, *b, *c, *d;
 
@@ -332,7 +332,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-DValue* DtoCastComplex(DValue* val, Type* _to)
+DValue* DtoCastComplex(Loc& loc, DValue* val, Type* _to)
 {
     Type* to = DtoDType(_to);
     Type* vty = val->getType();
@@ -370,14 +370,14 @@
             return new DImValue(to, val->isComplex()->im);
         LLValue* v = val->getRVal();
         DImValue* im = new DImValue(to, DtoLoad(DtoGEPi(v,0,1,"tmp")));
-        return DtoCastFloat(im, to);
+        return DtoCastFloat(loc, im, to);
     }
     else if (to->isfloating()) {
         if (val->isComplex())
             return new DImValue(to, val->isComplex()->re);
         LLValue* v = val->getRVal();
         DImValue* re = new DImValue(to, DtoLoad(DtoGEPi(v,0,0,"tmp")));
-        return DtoCastFloat(re, to);
+        return DtoCastFloat(loc, re, to);
     }
     else
     assert(0);