Skip to content

Commit

Permalink
gc: complex(0)
Browse files Browse the repository at this point in the history
Fixes #1232.

R=ken2
CC=golang-dev
https://golang.org/cl/3621041
  • Loading branch information
rsc committed Dec 13, 2010
1 parent 88cf556 commit 9e26c4b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/cmd/gc/const.c
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,6 @@ 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:
Expand Down Expand Up @@ -300,7 +298,7 @@ toflt(Val v)
f = mal(sizeof(*f));
mpmovefltflt(f, &v.u.cval->real);
if(mpcmpfltc(&v.u.cval->imag, 0) != 0)
yyerror("constant %#F truncated to real", v.u.fval);
yyerror("constant %#F%+#Fi truncated to real", &v.u.cval->real, &v.u.cval->imag);
v.ctype = CTFLT;
v.u.fval = f;
break;
Expand All @@ -324,9 +322,9 @@ toint(Val v)
case CTCPLX:
i = mal(sizeof(*i));
if(mpmovefltfix(i, &v.u.cval->real) < 0)
yyerror("constant %#F truncated to integer", v.u.fval);
yyerror("constant %#F%+#Fi truncated to integer", &v.u.cval->real, &v.u.cval->imag);
if(mpcmpfltc(&v.u.cval->imag, 0) != 0)
yyerror("constant %#F truncated to real", v.u.fval);
yyerror("constant %#F%+#Fi truncated to real", &v.u.cval->real, &v.u.cval->imag);
v.ctype = CTINT;
v.u.xval = i;
break;
Expand Down
2 changes: 2 additions & 0 deletions src/cmd/gc/mparith1.c
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,8 @@ Fconv(Fmt *fp)
// for well in range, convert to double and use print's %g
if(-900 < fvp->exp && fvp->exp < 900) {
d = mpgetflt(fvp);
if(d >= 0 && (fp->flags & FmtSign))
fmtprint(fp, "+");
return fmtprint(fp, "%g", d);
}
// TODO(rsc): for well out of range, print
Expand Down
1 change: 1 addition & 0 deletions test/cmplx.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ func main() {
c64 = cmplx(f32, f32)
c128 = cmplx(f64, f64)

_ = complex(0) // ok
_ = cmplx(f, f32) // ERROR "cmplx"
_ = cmplx(f, f64) // ERROR "cmplx"
_ = cmplx(f32, f) // ERROR "cmplx"
Expand Down

0 comments on commit 9e26c4b

Please sign in to comment.