mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-22 08:47:28 +01:00
Add an "iterate" keyword.
This commit is contained in:
1 parent
7b18295688
commit
51bd52239b
12 files changed
+253
-53
No files matched your search
+41
-6
@@ -41,6 +41,7 @@ const (
|
||||
KFile
|
||||
KFunc
|
||||
KIf
|
||||
KIterate
|
||||
KJump
|
||||
KPackageID
|
||||
KReturn
|
||||
@@ -71,6 +72,7 @@ var kindStrings = [...]string{
|
||||
KFile: "KFile",
|
||||
KFunc: "KFunc",
|
||||
KIf: "KIf",
|
||||
KIterate: "KIterate",
|
||||
KJump: "KJump",
|
||||
KPackageID: "KPackageID",
|
||||
KReturn: "KReturn",
|
||||
@@ -129,6 +131,7 @@ func (n *Node) Field() *Field { return (*Field)(n) }
|
||||
func (n *Node) File() *File { return (*File)(n) }
|
||||
func (n *Node) Func() *Func { return (*Func)(n) }
|
||||
func (n *Node) If() *If { return (*If)(n) }
|
||||
func (n *Node) Iterate() *Iterate { return (*Iterate)(n) }
|
||||
func (n *Node) Jump() *Jump { return (*Jump)(n) }
|
||||
func (n *Node) PackageID() *PackageID { return (*PackageID)(n) }
|
||||
func (n *Node) Raw() *Raw { return (*Raw)(n) }
|
||||
@@ -331,20 +334,24 @@ func NewAssign(operator t.ID, lhs *Expr, rhs *Expr) *Assign {
|
||||
}
|
||||
}
|
||||
|
||||
// Var is "var ID1 LHS" or "var ID1 LHS = RHS":
|
||||
// Var is "var ID1 LHS" or "var ID1 LHS = RHS" or an iterate variable
|
||||
// declaration "ID1 LHS : RHS":
|
||||
// - ID0: <0|IDEq|IDColon>
|
||||
// - ID1: name
|
||||
// - LHS: <TypeExpr>
|
||||
// - RHS: <nil|Expr>
|
||||
type Var Node
|
||||
|
||||
func (n *Var) Node() *Node { return (*Node)(n) }
|
||||
func (n *Var) Name() t.ID { return n.id1 }
|
||||
func (n *Var) XType() *TypeExpr { return n.lhs.TypeExpr() }
|
||||
func (n *Var) Value() *Expr { return n.rhs.Expr() }
|
||||
func (n *Var) Node() *Node { return (*Node)(n) }
|
||||
func (n *Var) IterateVariable() bool { return n.id0 == t.IDColon }
|
||||
func (n *Var) Name() t.ID { return n.id1 }
|
||||
func (n *Var) XType() *TypeExpr { return n.lhs.TypeExpr() }
|
||||
func (n *Var) Value() *Expr { return n.rhs.Expr() }
|
||||
|
||||
func NewVar(name t.ID, xType *TypeExpr, value *Expr) *Var {
|
||||
func NewVar(op t.ID, name t.ID, xType *TypeExpr, value *Expr) *Var {
|
||||
return &Var{
|
||||
kind: KVar,
|
||||
id0: op,
|
||||
id1: name,
|
||||
lhs: xType.Node(),
|
||||
rhs: value.Node(),
|
||||
@@ -371,6 +378,33 @@ func NewField(name t.ID, xType *TypeExpr, defaultValue *Expr) *Field {
|
||||
}
|
||||
}
|
||||
|
||||
// Iterate is "iterate:ID1 (vars) { List1 }":
|
||||
// - FlagsHasBreak is the iterate has an explicit break
|
||||
// - FlagsHasContinue is the iterate has an explicit continue
|
||||
// - ID1: <0|label>
|
||||
// - List0: <Var> variables
|
||||
// - List1: <Statement> loop body
|
||||
type Iterate Node
|
||||
|
||||
func (n *Iterate) Node() *Node { return (*Node)(n) }
|
||||
func (n *Iterate) HasBreak() bool { return n.flags&FlagsHasBreak != 0 }
|
||||
func (n *Iterate) HasContinue() bool { return n.flags&FlagsHasContinue != 0 }
|
||||
func (n *Iterate) Label() t.ID { return n.id1 }
|
||||
func (n *Iterate) Variables() []*Node { return n.list0 }
|
||||
func (n *Iterate) Body() []*Node { return n.list1 }
|
||||
|
||||
func (n *Iterate) SetHasBreak() { n.flags |= FlagsHasBreak }
|
||||
func (n *Iterate) SetHasContinue() { n.flags |= FlagsHasContinue }
|
||||
|
||||
func NewIterate(label t.ID, variables []*Node, body []*Node) *Iterate {
|
||||
return &Iterate{
|
||||
kind: KIterate,
|
||||
id1: label,
|
||||
list0: variables,
|
||||
list1: body,
|
||||
}
|
||||
}
|
||||
|
||||
// While is "while:ID1 LHS, List0 { List1 }":
|
||||
// - FlagsHasBreak is the while has an explicit break
|
||||
// - FlagsHasContinue is the while has an explicit continue
|
||||
@@ -585,6 +619,7 @@ const MaxBodyDepth = 255
|
||||
// - Assign
|
||||
// - Expr
|
||||
// - If
|
||||
// - Iterate
|
||||
// - Jump
|
||||
// - Return
|
||||
// - Var
|
||||
|
||||
+32
-12
@@ -265,22 +265,24 @@ func (q *checker) bcheckStatement(n *a.Node) error {
|
||||
// TODO.
|
||||
|
||||
case a.KVar:
|
||||
n := n.Var()
|
||||
if innTyp := n.XType().Innermost(); innTyp.IsRefined() {
|
||||
if _, _, err := typeBounds(q.tm, innTyp); err != nil {
|
||||
return q.bcheckVar(n.Var())
|
||||
|
||||
case a.KIterate:
|
||||
n := n.Iterate()
|
||||
for _, o := range n.Variables() {
|
||||
if err := q.bcheckVar(o.Var()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
lhs := a.NewExpr(a.FlagsTypeChecked, 0, n.Name(), nil, nil, nil, nil)
|
||||
lhs.SetMType(n.XType())
|
||||
rhs := n.Value()
|
||||
if rhs == nil {
|
||||
// "var x T" has an implicit "= 0".
|
||||
//
|
||||
// TODO: check that T is an integer type.
|
||||
rhs = zeroExpr
|
||||
// TODO: this isn't right, as the body is a loop, not an
|
||||
// execute-exactly-once block. We should have pre / inv / post
|
||||
// conditions, a la bcheckWhile.
|
||||
for _, o := range n.Body() {
|
||||
if err := q.bcheckStatement(o); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return q.bcheckAssignment(lhs, t.IDEq, rhs)
|
||||
return nil
|
||||
|
||||
case a.KWhile:
|
||||
return q.bcheckWhile(n.While())
|
||||
@@ -636,6 +638,24 @@ func (q *checker) bcheckWhile(n *a.While) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (q *checker) bcheckVar(n *a.Var) error {
|
||||
if innTyp := n.XType().Innermost(); innTyp.IsRefined() {
|
||||
if _, _, err := typeBounds(q.tm, innTyp); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
lhs := a.NewExpr(a.FlagsTypeChecked, 0, n.Name(), nil, nil, nil, nil)
|
||||
lhs.SetMType(n.XType())
|
||||
rhs := n.Value()
|
||||
if rhs == nil {
|
||||
// "var x T" has an implicit "= 0".
|
||||
//
|
||||
// TODO: check that T is an integer type.
|
||||
rhs = zeroExpr
|
||||
}
|
||||
return q.bcheckAssignment(lhs, t.IDEq, rhs)
|
||||
}
|
||||
|
||||
func (q *checker) bcheckExpr(n *a.Expr, depth uint32) (*big.Int, *big.Int, error) {
|
||||
if depth > a.MaxExprDepth {
|
||||
return nil, nil, fmt.Errorf("check: expression recursion depth too large")
|
||||
|
||||
+38
-1
@@ -39,6 +39,14 @@ func (q *checker) tcheckVars(block []*a.Node) error {
|
||||
}
|
||||
}
|
||||
|
||||
case a.KIterate:
|
||||
if err := q.tcheckVars(o.Iterate().Variables()); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := q.tcheckVars(o.Iterate().Body()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
case a.KVar:
|
||||
o := o.Var()
|
||||
name := o.Name()
|
||||
@@ -167,8 +175,24 @@ func (q *checker) tcheckStatement(n *a.Node) error {
|
||||
}
|
||||
lTyp := n.XType()
|
||||
rTyp := value.MType()
|
||||
if (rTyp.IsIdeal() && lTyp.IsNumType()) || lTyp.EqIgnoringRefinements(rTyp) {
|
||||
if n.IterateVariable() {
|
||||
if lTyp.Decorator().Key() != t.KeyPtr {
|
||||
return fmt.Errorf("check: iterate variable %q, of type %q, does not have a pointer type",
|
||||
n.Name().String(q.tm), lTyp.String(q.tm))
|
||||
}
|
||||
if rTyp.Decorator().Key() != t.KeyColon {
|
||||
return fmt.Errorf("check: iterate range %q, of type %q, does not have a slice type",
|
||||
value.String(q.tm), rTyp.String(q.tm))
|
||||
}
|
||||
if !lTyp.Inner().Eq(rTyp.Inner()) {
|
||||
return fmt.Errorf("check: cannot iterate %q of type %q over %q of type %q "+
|
||||
"as their inner types don't match",
|
||||
n.Name().String(q.tm), lTyp.String(q.tm), value.String(q.tm), rTyp.String(q.tm))
|
||||
}
|
||||
|
||||
} else if (rTyp.IsIdeal() && lTyp.IsNumType()) || lTyp.EqIgnoringRefinements(rTyp) {
|
||||
// No-op.
|
||||
|
||||
} else {
|
||||
return fmt.Errorf("check: cannot assign %q of type %q to %q of type %q",
|
||||
value.String(q.tm), rTyp.String(q.tm), n.Name().String(q.tm), lTyp.String(q.tm))
|
||||
@@ -177,6 +201,19 @@ func (q *checker) tcheckStatement(n *a.Node) error {
|
||||
// TODO: check that the default zero value is assignable to n.XType().
|
||||
}
|
||||
|
||||
case a.KIterate:
|
||||
n := n.Iterate()
|
||||
for _, o := range n.Variables() {
|
||||
if err := q.tcheckStatement(o); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
for _, o := range n.Body() {
|
||||
if err := q.tcheckStatement(o); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
case a.KWhile:
|
||||
n := n.While()
|
||||
cond := n.Condition()
|
||||
|
||||
+75
-30
@@ -538,6 +538,11 @@ func (p *parser) parseStatement() (*a.Node, error) {
|
||||
n, err := p.parseStatement1()
|
||||
if n != nil {
|
||||
n.Raw().SetFilenameLine(p.filename, line)
|
||||
if n.Kind() == a.KIterate {
|
||||
for _, o := range n.Iterate().Variables() {
|
||||
o.Raw().SetFilenameLine(p.filename, line)
|
||||
}
|
||||
}
|
||||
}
|
||||
return n, err
|
||||
}
|
||||
@@ -563,6 +568,22 @@ func (p *parser) parseStatement1() (*a.Node, error) {
|
||||
}
|
||||
return a.NewJump(x, label).Node(), nil
|
||||
|
||||
case t.KeyIterate:
|
||||
p.src = p.src[1:]
|
||||
label, err := p.parseLabel()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
vars, err := p.parseList(t.KeyCloseParen, (*parser).parseIterateVariableNode)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
body, err := p.parseBlock()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return a.NewIterate(label, vars, body).Node(), nil
|
||||
|
||||
case t.KeyWhile:
|
||||
p.src = p.src[1:]
|
||||
label, err := p.parseLabel()
|
||||
@@ -619,36 +640,7 @@ func (p *parser) parseStatement1() (*a.Node, error) {
|
||||
|
||||
case t.KeyVar:
|
||||
p.src = p.src[1:]
|
||||
id, err := p.parseIdent()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
typ, err := p.parseTypeExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
value := (*a.Expr)(nil)
|
||||
if p.peek1().Key() == t.KeyEq {
|
||||
p.src = p.src[1:]
|
||||
switch p.peek1().Key() {
|
||||
case t.KeyLimit:
|
||||
value, err = p.parseLimitExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
case t.KeyTry:
|
||||
value, err = p.parseTryExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
default:
|
||||
value, err = p.parseExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
}
|
||||
return a.NewVar(id, typ, value).Node(), nil
|
||||
return p.parseVar(false)
|
||||
}
|
||||
|
||||
lhs, err := p.parseExpr()
|
||||
@@ -717,6 +709,59 @@ func (p *parser) parseArgNode() (*a.Node, error) {
|
||||
return a.NewArg(name, value).Node(), nil
|
||||
}
|
||||
|
||||
func (p *parser) parseIterateVariableNode() (*a.Node, error) {
|
||||
return p.parseVar(true)
|
||||
}
|
||||
|
||||
func (p *parser) parseVar(inIterate bool) (*a.Node, error) {
|
||||
id, err := p.parseIdent()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
typ, err := p.parseTypeExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
value := (*a.Expr)(nil)
|
||||
|
||||
op := t.ID(0)
|
||||
if inIterate {
|
||||
op = t.IDColon
|
||||
if x := p.peek1().Key(); x != t.KeyColon {
|
||||
got := p.tm.ByKey(x)
|
||||
return nil, fmt.Errorf(`parse: expected ":", got %q at %s:%d`, got, p.filename, p.line())
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
value, err = p.parseExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
} else if p.peek1().Key() == t.KeyEq {
|
||||
op = t.IDEq
|
||||
p.src = p.src[1:]
|
||||
switch p.peek1().Key() {
|
||||
case t.KeyLimit:
|
||||
value, err = p.parseLimitExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
case t.KeyTry:
|
||||
value, err = p.parseTryExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
default:
|
||||
value, err = p.parseExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return a.NewVar(op, id, typ, value).Node(), nil
|
||||
}
|
||||
|
||||
func (p *parser) parseDollarExpr() (*a.Expr, error) {
|
||||
if x := p.peek1().Key(); x != t.KeyDollar {
|
||||
got := p.tm.ByKey(x)
|
||||
|
||||
@@ -239,6 +239,7 @@ const (
|
||||
KeyPackageID = Key(IDPackageID >> KeyShift)
|
||||
KeyConst = Key(IDConst >> KeyShift)
|
||||
KeyTry = Key(IDTry >> KeyShift)
|
||||
KeyIterate = Key(IDIterate >> KeyShift)
|
||||
|
||||
KeyFalse = Key(IDFalse >> KeyShift)
|
||||
KeyTrue = Key(IDTrue >> KeyShift)
|
||||
@@ -420,6 +421,7 @@ const (
|
||||
IDPackageID = ID(0x76<<KeyShift | FlagsOther)
|
||||
IDConst = ID(0x77<<KeyShift | FlagsOther)
|
||||
IDTry = ID(0x78<<KeyShift | FlagsOther)
|
||||
IDIterate = ID(0x79<<KeyShift | FlagsOther)
|
||||
|
||||
IDFalse = ID(0x80<<KeyShift | FlagsLiteral | FlagsImplicitSemicolon)
|
||||
IDTrue = ID(0x81<<KeyShift | FlagsLiteral | FlagsImplicitSemicolon)
|
||||
@@ -617,6 +619,7 @@ var builtInsByKey = [nBuiltInKeys]struct {
|
||||
KeyPackageID: {"packageid", IDPackageID},
|
||||
KeyConst: {"const", IDConst},
|
||||
KeyTry: {"try", IDTry},
|
||||
KeyIterate: {"iterate", IDIterate},
|
||||
|
||||
KeyFalse: {"false", IDFalse},
|
||||
KeyTrue: {"true", IDTrue},
|
||||
|
||||
Reference in new issue
Block a user