summaryrefslogtreecommitdiff
path: root/src/cmd/gc/const.c
diff options
context:
space:
mode:
authorKen Thompson <ken@golang.org>2010-03-09 17:51:30 -0800
committerKen Thompson <ken@golang.org>2010-03-09 17:51:30 -0800
commitace1722943df8c0ff5e54650e3c3db47fe6482de (patch)
tree02d22e4424d71c0d52b0e6e93dbaadaca0eacd2c /src/cmd/gc/const.c
parent4920e345473d3a667cce4e1824981625fb323d6c (diff)
downloadgolang-ace1722943df8c0ff5e54650e3c3db47fe6482de.tar.gz
1. decommit complex(float) conversion
2. add complex algorithm for map/chan 3. test for use of complex in array, slice, field, chan, map, field, pointer. R=rsc CC=golang-dev http://codereview.appspot.com/384041
Diffstat (limited to 'src/cmd/gc/const.c')
-rw-r--r--src/cmd/gc/const.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/gc/const.c b/src/cmd/gc/const.c
index 7debb3708..be351def6 100644
--- a/src/cmd/gc/const.c
+++ b/src/cmd/gc/const.c
@@ -76,14 +76,12 @@ convlit1(Node **np, Type *t, int explicit)
if(!explicit && !isideal(n->type))
return;
-//dump("convlit1", n);
if(n->op == OLITERAL) {
nn = nod(OXXX, N, N);
*nn = *n;
n = nn;
*np = n;
}
-//dump("convlit2", n);
switch(n->op) {
default:
@@ -203,6 +201,8 @@ convlit1(Node **np, Type *t, int explicit)
goto bad;
case CTFLT:
case CTINT:
+ if(explicit)
+ goto bad;
n->val = tocplx(n->val);
break;
case CTCPLX: