mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 16:47:28 +01:00
Check "x = 1 + x".
This commit is contained in:
1 parent
bd5f222fb6
commit
a5a5509a44
2 files changed
+25
-8
No files matched your search
@@ -54,7 +54,7 @@ func TestCheck(t *testing.T) {
|
||||
var b bool
|
||||
|
||||
x = 0
|
||||
x = 1 + 2
|
||||
x = 1 + x
|
||||
y = -y
|
||||
b = not true
|
||||
|
||||
|
||||
+24
-7
@@ -295,12 +295,25 @@ func (c *typeChecker) checkExprBinaryOp(n *a.Expr) error {
|
||||
c.idMap.ByID(op.AmbiguousForm()), rhs.String(c.idMap), rTyp.String(c.idMap))
|
||||
}
|
||||
}
|
||||
if op != t.IDXBinaryShiftL && op != t.IDXBinaryShiftR && !lTyp.Eq(rTyp) {
|
||||
return fmt.Errorf("check: binary %q: %q and %q, of types %q and %q, does not have matching types",
|
||||
c.idMap.ByID(op.AmbiguousForm()),
|
||||
lhs.String(c.idMap), rhs.String(c.idMap),
|
||||
lTyp.String(c.idMap), rTyp.String(c.idMap),
|
||||
)
|
||||
|
||||
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",
|
||||
c.idMap.ByID(op.AmbiguousForm()),
|
||||
lhs.String(c.idMap), rhs.String(c.idMap),
|
||||
lTyp.String(c.idMap), rTyp.String(c.idMap),
|
||||
)
|
||||
}
|
||||
case t.IDXBinaryShiftL, t.IDXBinaryShiftR:
|
||||
if (lTyp == TypeExprIdealNumber) && (rTyp != TypeExprIdealNumber) {
|
||||
return fmt.Errorf("check: binary %q: %q and %q, of types %q and %q; "+
|
||||
"cannot shift an ideal number by a non-ideal number",
|
||||
c.idMap.ByID(op.AmbiguousForm()),
|
||||
lhs.String(c.idMap), rhs.String(c.idMap),
|
||||
lTyp.String(c.idMap), rTyp.String(c.idMap),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
if l, r := lhs.ConstValue(), rhs.ConstValue(); l != nil && r != nil {
|
||||
@@ -308,11 +321,15 @@ func (c *typeChecker) checkExprBinaryOp(n *a.Expr) error {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if comparisonOps[0xFF&op.Key()] {
|
||||
n.SetMType(TypeExprBoolean)
|
||||
} else {
|
||||
} else if lTyp != TypeExprIdealNumber {
|
||||
n.SetMType(lTyp)
|
||||
} else {
|
||||
n.SetMType(rTyp)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user