mirror of
https://github.com/golang/go
synced 2024-11-11 17:51:49 -07:00
gc: drop ideal bool
R=golang-dev, ken2 CC=golang-dev https://golang.org/cl/5674098
This commit is contained in:
parent
ad17a9c0a9
commit
126d475a43
@ -586,7 +586,7 @@ evconst(Node *n)
|
||||
n->diag = 1;
|
||||
}
|
||||
return;
|
||||
|
||||
|
||||
case TUP(OADD, CTINT):
|
||||
case TUP(OADD, CTRUNE):
|
||||
mpaddfixfix(v.u.xval, rv.u.xval, 0);
|
||||
@ -660,7 +660,6 @@ evconst(Node *n)
|
||||
}
|
||||
mpdivfltflt(v.u.fval, rv.u.fval);
|
||||
break;
|
||||
|
||||
case TUP(OADD, CTCPLX):
|
||||
mpaddfltflt(&v.u.cval->real, &rv.u.cval->real);
|
||||
mpaddfltflt(&v.u.cval->imag, &rv.u.cval->imag);
|
||||
@ -936,7 +935,7 @@ nodlit(Val v)
|
||||
n->type = idealstring;
|
||||
break;
|
||||
case CTBOOL:
|
||||
n->type = idealbool;
|
||||
n->type = types[TBOOL];
|
||||
break;
|
||||
case CTINT:
|
||||
case CTRUNE:
|
||||
@ -1025,7 +1024,7 @@ defaultlit(Node **np, Type *t)
|
||||
defaultlit(&n->left, t);
|
||||
defaultlit(&n->right, t);
|
||||
}
|
||||
if(n->type == idealbool || n->type == idealstring)
|
||||
if(n->type == types[TBOOL] || n->type == idealstring)
|
||||
n->type = types[n->type->etype];
|
||||
else
|
||||
n->type = n->left->type;
|
||||
|
@ -122,7 +122,7 @@ reexportdep(Node *n)
|
||||
|
||||
case OLITERAL:
|
||||
t = n->type;
|
||||
if(t != types[n->type->etype] && t != idealbool && t != idealstring) {
|
||||
if(t != types[n->type->etype] && t != idealstring) {
|
||||
if(isptr[t->etype])
|
||||
t = t->type;
|
||||
if (t && t->sym && t->sym->def && t->sym->pkg != localpkg && t->sym->pkg != builtinpkg) {
|
||||
|
@ -602,7 +602,7 @@ typefmt(Fmt *fp, Type *t)
|
||||
}
|
||||
|
||||
if(t->etype < nelem(basicnames) && basicnames[t->etype] != nil) {
|
||||
if(fmtmode == FErr && (t == idealbool || t == idealstring))
|
||||
if(fmtmode == FErr && t == idealstring)
|
||||
fmtstrcpy(fp, "ideal ");
|
||||
return fmtstrcpy(fp, basicnames[t->etype]);
|
||||
}
|
||||
@ -1086,7 +1086,7 @@ exprfmt(Fmt *f, Node *n, int prec)
|
||||
return fmtprint(f, "%S", n->sym);
|
||||
if(n->val.ctype == CTNIL)
|
||||
n = n->orig; // if this node was a nil decorated with at type, print the original naked nil
|
||||
if(n->type != types[n->type->etype] && n->type != idealbool && n->type != idealstring) {
|
||||
if(n->type != types[n->type->etype] && n->type != idealstring) {
|
||||
// Need parens when type begins with what might
|
||||
// be misinterpreted as a unary operator: * or <-.
|
||||
if(isptr[n->type->etype] || (n->type->etype == TCHAN && n->type->chan == Crecv))
|
||||
|
@ -775,7 +775,6 @@ EXTERN Idir* idirs;
|
||||
|
||||
EXTERN Type* types[NTYPE];
|
||||
EXTERN Type* idealstring;
|
||||
EXTERN Type* idealbool;
|
||||
EXTERN Type* bytetype;
|
||||
EXTERN Type* runetype;
|
||||
EXTERN Type* errortype;
|
||||
|
@ -1824,17 +1824,16 @@ lexinit(void)
|
||||
// this is the ideal form
|
||||
// (the type of x in const x = "hello").
|
||||
idealstring = typ(TSTRING);
|
||||
idealbool = typ(TBOOL);
|
||||
|
||||
s = pkglookup("true", builtinpkg);
|
||||
s->def = nodbool(1);
|
||||
s->def->sym = lookup("true");
|
||||
s->def->type = idealbool;
|
||||
s->def->type = types[TBOOL];
|
||||
|
||||
s = pkglookup("false", builtinpkg);
|
||||
s->def = nodbool(0);
|
||||
s->def->sym = lookup("false");
|
||||
s->def->type = idealbool;
|
||||
s->def->type = types[TBOOL];
|
||||
|
||||
s = lookup("_");
|
||||
s->block = -100;
|
||||
|
@ -768,7 +768,7 @@ nodbool(int b)
|
||||
c = nodintconst(0);
|
||||
c->val.ctype = CTBOOL;
|
||||
c->val.u.bval = b;
|
||||
c->type = idealbool;
|
||||
c->type = types[TBOOL];
|
||||
return c;
|
||||
}
|
||||
|
||||
@ -929,7 +929,7 @@ isideal(Type *t)
|
||||
{
|
||||
if(t == T)
|
||||
return 0;
|
||||
if(t == idealstring || t == idealbool)
|
||||
if(t == idealstring)
|
||||
return 1;
|
||||
switch(t->etype) {
|
||||
case TNIL:
|
||||
|
@ -20,7 +20,6 @@ func main() {
|
||||
type B bool
|
||||
b := B(false)
|
||||
mb := make(map[B]int)
|
||||
mb[false] = 42 // this should work: false is assignment compatible with B
|
||||
mb[b] = 42
|
||||
|
||||
type Z int
|
||||
|
@ -31,7 +31,6 @@ func asString(String) {}
|
||||
|
||||
func (Map) M() {}
|
||||
|
||||
|
||||
// These functions check at run time that the default type
|
||||
// (in the absence of any implicit conversion hints)
|
||||
// is the given type.
|
||||
@ -47,7 +46,7 @@ func isString(x interface{}) { _ = x.(String) }
|
||||
func main() {
|
||||
var (
|
||||
a Array
|
||||
b Bool = true
|
||||
b Bool = Bool(true)
|
||||
c Chan = make(Chan)
|
||||
f Float = 1
|
||||
i Int = 1
|
||||
@ -67,7 +66,6 @@ func main() {
|
||||
isBool(b)
|
||||
asBool(!b)
|
||||
isBool(!b)
|
||||
asBool(true)
|
||||
asBool(*&b)
|
||||
isBool(*&b)
|
||||
asBool(Bool(true))
|
||||
|
@ -26,7 +26,7 @@ type String string
|
||||
|
||||
func main() {
|
||||
var (
|
||||
b Bool = true
|
||||
b Bool = Bool(true)
|
||||
i, j int
|
||||
c = make(chan int)
|
||||
m = make(Map)
|
||||
@ -34,7 +34,7 @@ func main() {
|
||||
|
||||
asBool(b)
|
||||
asBool(!b)
|
||||
asBool(true)
|
||||
asBool(true) // ERROR "cannot use.*type bool.*as type Bool"
|
||||
asBool(*&b)
|
||||
asBool(Bool(true))
|
||||
asBool(1 != 2) // ERROR "cannot use.*type bool.*as type Bool"
|
||||
|
Loading…
Reference in New Issue
Block a user