diff --git a/lang/ast/ast.go b/lang/ast/ast.go index c944c12a..554a3abf 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -27,7 +27,6 @@ const ( KContinue KExpr KFile - KFor KFunc KIf KParam @@ -36,6 +35,7 @@ const ( KTypeExpr KUse KVar + KWhile ) func (k Kind) String() string { @@ -54,7 +54,6 @@ var kindStrings = [...]string{ KContinue: "KContinue", KExpr: "KExpr", KFile: "KFile", - KFor: "KFor", KFunc: "KFunc", KIf: "KIf", KParam: "KParam", @@ -63,6 +62,7 @@ var kindStrings = [...]string{ KTypeExpr: "KTypeExpr", KUse: "KUse", KVar: "KVar", + KWhile: "KWhile", } type Flags uint32 @@ -99,7 +99,6 @@ func (n *Node) Break() *Break { return (*Break)(n) } func (n *Node) Continue() *Continue { return (*Continue)(n) } func (n *Node) Expr() *Expr { return (*Expr)(n) } func (n *Node) File() *File { return (*File)(n) } -func (n *Node) For() *For { return (*For)(n) } func (n *Node) Func() *Func { return (*Func)(n) } func (n *Node) If() *If { return (*If)(n) } func (n *Node) Param() *Param { return (*Param)(n) } @@ -109,6 +108,7 @@ func (n *Node) Struct() *Struct { return (*Struct)(n) } func (n *Node) TypeExpr() *TypeExpr { return (*TypeExpr)(n) } func (n *Node) Use() *Use { return (*Use)(n) } func (n *Node) Var() *Var { return (*Var)(n) } +func (n *Node) While() *While { return (*While)(n) } func (n *Node) Walk(f func(*Node) error) error { if n != nil { @@ -281,18 +281,18 @@ func NewParam(name t.ID, xType *TypeExpr) *Param { } } -// For is "for { List2 }" or "for LHS { List2 }": +// While is "while { List2 }" or "while LHS { List2 }": // - LHS: // - List2: <*> loop body -type For Node +type While Node -func (n *For) Node() *Node { return (*Node)(n) } -func (n *For) Condition() *Expr { return n.lhs.Expr() } -func (n *For) Body() []*Node { return n.list2 } +func (n *While) Node() *Node { return (*Node)(n) } +func (n *While) Condition() *Expr { return n.lhs.Expr() } +func (n *While) Body() []*Node { return n.list2 } -func NewFor(condition *Expr, body []*Node) *For { - return &For{ - kind: KFor, +func NewWhile(condition *Expr, body []*Node) *While { + return &While{ + kind: KWhile, lhs: condition.Node(), list2: body, } diff --git a/lang/check/check_test.go b/lang/check/check_test.go index 7dab794b..28f493b7 100644 --- a/lang/check/check_test.go +++ b/lang/check/check_test.go @@ -63,7 +63,7 @@ func TestCheck(t *testing.T) { var i i32 var j i32[0:8] - for i == j { + while i == j { } } `) + "\n" diff --git a/lang/check/type.go b/lang/check/type.go index 5e402723..4592783d 100644 --- a/lang/check/type.go +++ b/lang/check/type.go @@ -78,8 +78,8 @@ func (c *typeChecker) checkStatement(n *a.Node) error { } return nil - case a.KFor: - o := n.For() + case a.KWhile: + o := n.While() if cond := o.Condition(); cond != nil { if err := c.checkExpr(cond); err != nil { return err diff --git a/lang/parse/parse.go b/lang/parse/parse.go index 9d74535c..838532ef 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -387,7 +387,7 @@ func (p *parser) parseStatement1() (*a.Node, error) { p.src = p.src[1:] return a.NewContinue().Node(), nil - case t.IDFor: + case t.IDWhile: p.src = p.src[1:] condition, err := (*a.Expr)(nil), error(nil) if p.peekID() != t.IDOpenCurly { @@ -400,7 +400,7 @@ func (p *parser) parseStatement1() (*a.Node, error) { if err != nil { return nil, err } - return a.NewFor(condition, body).Node(), nil + return a.NewWhile(condition, body).Node(), nil case t.IDIf: o, err := p.parseIf() diff --git a/lang/token/list.go b/lang/token/list.go index 821d43b3..8e82a42d 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -171,7 +171,7 @@ const ( IDFunc = ID(0x60<> KeyShift: {"func", IDFunc}, IDPtr >> KeyShift: {"ptr", IDPtr}, IDAssert >> KeyShift: {"assert", IDAssert}, - IDFor >> KeyShift: {"for", IDFor}, + IDWhile >> KeyShift: {"while", IDWhile}, IDIf >> KeyShift: {"if", IDIf}, IDElse >> KeyShift: {"else", IDElse}, IDReturn >> KeyShift: {"return", IDReturn},