diff --git a/cmd/puffs-gen-c/main.go b/cmd/puffs-gen-c/main.go index 07d90e33..6afb3c89 100644 --- a/cmd/puffs-gen-c/main.go +++ b/cmd/puffs-gen-c/main.go @@ -931,7 +931,7 @@ func (g *gen) writeExpr(n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, d } if cv := n.ConstValue(); cv != nil { - if nTyp := n.MType(); nTyp.PackageOrDecorator() != 0 || nTyp.Name().Key() != t.KeyBool { + if !n.MType().IsBool() { g.writes(cv.String()) } else if cv.Cmp(zero) == 0 { g.writes("false") diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 5e3abd61..61c56d11 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -21,6 +21,7 @@ var numTypeBounds = [256][2]*big.Int{ t.KeyU32: {zero, big.NewInt(0).SetUint64(1<<32 - 1)}, t.KeyU64: {zero, big.NewInt(0).SetUint64(1<<64 - 1)}, t.KeyUsize: {zero, zero}, + t.KeyBool: {zero, one}, } var ( @@ -300,9 +301,6 @@ func (q *checker) bcheckAssignment1(lhs *a.Expr, op t.ID, rhs *a.Expr) error { // TODO: handle. return nil } - if lhs.MType().Name().Key() == t.KeyBool { - return nil - } _, _, err := q.bcheckExpr(lhs, 0) if err != nil { @@ -813,9 +811,7 @@ func (q *checker) bcheckTypeExpr(n *a.TypeExpr) (*big.Int, *big.Int, error) { } b := [2]*big.Int{} - if key := n.Name().Key(); key == t.KeyBool { - b = [2]*big.Int{zero, one} - } else if key < t.Key(len(numTypeBounds)) { + if key := n.Name().Key(); key < t.Key(len(numTypeBounds)) { b = numTypeBounds[key] } if b[0] == nil || b[1] == nil {