mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 16:47:28 +01:00
Make Iterate contain Assign's not Var's
This commit is contained in:
1 parent
cd9ab50f63
commit
d552f88738
13 files changed
+91
-91
No files matched your search
@@ -256,8 +256,9 @@ func (q *checker) bcheckStatement(n *a.Node) error {
|
||||
|
||||
case a.KIterate:
|
||||
n := n.AsIterate()
|
||||
for _, o := range n.Variables() {
|
||||
if err := q.bcheckVar(o.AsVar()); err != nil {
|
||||
for _, o := range n.Assigns() {
|
||||
o := o.AsAssign()
|
||||
if err := q.bcheckAssignment(o.LHS(), o.Operator(), o.RHS()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -265,12 +266,12 @@ func (q *checker) bcheckStatement(n *a.Node) error {
|
||||
// execute-exactly-once block. We should have pre / inv / post
|
||||
// conditions, a la bcheckWhile.
|
||||
|
||||
variables := n.Variables()
|
||||
assigns := n.Assigns()
|
||||
for ; n != nil; n = n.ElseIterate() {
|
||||
q.facts = q.facts[:0]
|
||||
for _, o := range variables {
|
||||
v := o.AsVar()
|
||||
q.facts = append(q.facts, makeSliceLengthEqEq(v.Name(), v.XType(), n.Length()))
|
||||
for _, o := range assigns {
|
||||
lhs := o.AsAssign().LHS()
|
||||
q.facts = append(q.facts, makeSliceLengthEqEq(lhs.Ident(), lhs.MType(), n.Length()))
|
||||
}
|
||||
if err := q.bcheckBlock(n.Body()); err != nil {
|
||||
return err
|
||||
|
||||
+7
-15
@@ -44,9 +44,6 @@ func (q *checker) tcheckVars(block []*a.Node) error {
|
||||
|
||||
case a.KIterate:
|
||||
for o := o.AsIterate(); o != nil; o = o.ElseIterate() {
|
||||
if err := q.tcheckVars(o.Variables()); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := q.tcheckVars(o.Body()); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -150,10 +147,15 @@ func (q *checker) tcheckStatement(n *a.Node) error {
|
||||
|
||||
case a.KIterate:
|
||||
for n := n.AsIterate(); n != nil; n = n.ElseIterate() {
|
||||
for _, o := range n.Variables() {
|
||||
for _, o := range n.Assigns() {
|
||||
if err := q.tcheckStatement(o); err != nil {
|
||||
return err
|
||||
}
|
||||
o := o.AsAssign()
|
||||
if typ := o.LHS().MType(); !typ.IsSliceType() {
|
||||
return fmt.Errorf("check: iterate assignment to %q, of type %q, does not have slice type",
|
||||
o.LHS().Str(q.tm), typ.Str(q.tm))
|
||||
}
|
||||
}
|
||||
// TODO: prohibit jumps (breaks, continues), rets (returns, yields) and
|
||||
// retry-calling ? methods while inside an iterate body.
|
||||
@@ -223,17 +225,7 @@ func (q *checker) tcheckStatement(n *a.Node) error {
|
||||
}
|
||||
lTyp := n.XType()
|
||||
rTyp := value.MType()
|
||||
if n.IterateVariable() {
|
||||
if !lTyp.IsSliceType() {
|
||||
return fmt.Errorf("check: iterate variable %q, of type %q, does not have a slice type",
|
||||
n.Name().Str(q.tm), lTyp.Str(q.tm))
|
||||
}
|
||||
if !lTyp.Eq(rTyp) {
|
||||
return fmt.Errorf("check: cannot iterate %q of type %q over %q of type %q "+
|
||||
"as their types don't match",
|
||||
n.Name().Str(q.tm), lTyp.Str(q.tm), value.Str(q.tm), rTyp.Str(q.tm))
|
||||
}
|
||||
} else if err := q.tcheckEq(n.Name(), nil, lTyp, value, rTyp); err != nil {
|
||||
if err := q.tcheckEq(n.Name(), nil, lTyp, value, rTyp); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user