Check "i < j" when i's type refines j's type.

This commit is contained in:
Nigel Tao committed 2017-05-13 10:40:48 +10:00
1 parent 87dcd9ed55
commit 7367a382b2
4 files changed
+27 -8

No files matched your search

+6 -1
View File
@@ -60,7 +60,10 @@ func TestCheck(t *testing.T) {
y = x as i32
for x > 0 {
var i i32
var j i32[0:8]
for i == j {
}
}
`) + "\n"
@@ -114,6 +117,8 @@ func TestCheck(t *testing.T) {
want := [][2]string{
{"a", "[4] u8"},
{"b", "bool"},
{"i", "i32"},
{"j", "i32[0:8]"},
{"x", "u8"},
{"y", "i32"},
{"z", "u64[:123]"},
+3 -3
View File
@@ -67,7 +67,7 @@ func (c *typeChecker) checkStatement(n *a.Node) error {
lTyp := l.MType()
rTyp := r.MType()
// TODO, look at o.Operator().
if (rTyp == TypeExprIdealNumber && lTyp.IsNumType()) || lTyp.Eq(rTyp) {
if (rTyp == TypeExprIdealNumber && lTyp.IsNumType()) || lTyp.EqIgnoringRefinements(rTyp) {
return nil
}
return fmt.Errorf("check: cannot assign %q of type %q to %q of type %q",
@@ -301,8 +301,8 @@ func (c *typeChecker) checkExprBinaryOp(n *a.Expr) error {
switch op {
default:
if !lTyp.Eq(rTyp) && lTyp != TypeExprIdealNumber && rTyp != TypeExprIdealNumber {
return fmt.Errorf("check: binary %q: %q and %q, of types %q and %q, does not have compatible types",
if !lTyp.EqIgnoringRefinements(rTyp) && lTyp != TypeExprIdealNumber && rTyp != TypeExprIdealNumber {
return fmt.Errorf("check: binary %q: %q and %q, of types %q and %q, do not have compatible types",
c.idMap.ByID(op.AmbiguousForm()),
lhs.String(c.idMap), rhs.String(c.idMap),
lTyp.String(c.idMap), rTyp.String(c.idMap),