diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 6f1bdec9..8926909a 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -135,6 +135,15 @@ func (q *checker) bcheckStatement(n *a.Node) error { n := n.Assign() return q.bcheckAssignment(n.LHS(), n.LHS().MType(), n.Operator(), n.RHS()) + case a.KIf: + // TODO. + + case a.KJump: + // No-op. + + case a.KReturn: + // TODO. + case a.KVar: n := n.Var() return q.bcheckAssignment(nil, n.XType(), t.IDEq, n.Value()) @@ -142,15 +151,6 @@ func (q *checker) bcheckStatement(n *a.Node) error { case a.KWhile: return q.bcheckWhile(n.While()) - case a.KIf: - // TODO. - - case a.KReturn: - // TODO. - - case a.KJump: - // No-op. - default: return fmt.Errorf("check: unrecognized ast.Kind (%s) for checkStatement", n.Kind()) } diff --git a/lang/check/type.go b/lang/check/type.go index 22619036..65e3d1a6 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -50,6 +50,41 @@ func (q *checker) tcheckStatement(n *a.Node) error { return err } + case a.KIf: + for n := n.If(); n != nil; n = n.ElseIf() { + cond := n.Condition() + if err := q.tcheckExpr(cond, 0); err != nil { + return err + } + if !cond.MType().Eq(TypeExprBoolean) { + return fmt.Errorf("check: if condition %q, of type %q, does not have a boolean type", + cond.String(q.idMap), cond.MType().String(q.idMap)) + } + for _, o := range n.BodyIfTrue() { + if err := q.tcheckStatement(o); err != nil { + return err + } + } + for _, o := range n.BodyIfFalse() { + if err := q.tcheckStatement(o); err != nil { + return err + } + } + } + + case a.KJump: + // TODO: check that we're in a for loop. + + case a.KReturn: + n := n.Return() + if value := n.Value(); value != nil { + if err := q.tcheckExpr(value, 0); err != nil { + return err + } + // TODO: type-check that value is assignable to the return value. + // This needs the context of what func we're in. + } + case a.KVar: n := n.Var() if !n.XType().Node().TypeChecked() { @@ -84,41 +119,6 @@ func (q *checker) tcheckStatement(n *a.Node) error { } } - case a.KIf: - for n := n.If(); n != nil; n = n.ElseIf() { - cond := n.Condition() - if err := q.tcheckExpr(cond, 0); err != nil { - return err - } - if !cond.MType().Eq(TypeExprBoolean) { - return fmt.Errorf("check: if condition %q, of type %q, does not have a boolean type", - cond.String(q.idMap), cond.MType().String(q.idMap)) - } - for _, o := range n.BodyIfTrue() { - if err := q.tcheckStatement(o); err != nil { - return err - } - } - for _, o := range n.BodyIfFalse() { - if err := q.tcheckStatement(o); err != nil { - return err - } - } - } - - case a.KReturn: - n := n.Return() - if value := n.Value(); value != nil { - if err := q.tcheckExpr(value, 0); err != nil { - return err - } - // TODO: type-check that value is assignable to the return value. - // This needs the context of what func we're in. - } - - case a.KJump: - // TODO: check that we're in a for loop. - default: return fmt.Errorf("check: unrecognized ast.Kind (%s) for checkStatement", n.Kind()) }