Add endwhile syntax

This commit is contained in:
Nigel Tao committed 2020-02-22 13:11:02 +11:00
1 parent d1a4abe321
commit b1e3a15c08
9 files changed
+53 -29

No files matched your search

+20
View File
@@ -644,6 +644,22 @@ func (p *parser) parseLabel() (t.ID, error) {
return 0, nil
}
func (p *parser) parseEndwhile(label t.ID) bool {
if p.peek1() != t.IDEndwhile {
return false
}
p.src = p.src[1:]
if p.peek1() != t.IDDot {
return false
}
p.src = p.src[1:]
if p.peek1() != label {
return false
}
p.src = p.src[1:]
return true
}
func (p *parser) parseStatement1() (*a.Node, error) {
x := p.peek1()
if x == t.IDVar {
@@ -721,6 +737,10 @@ func (p *parser) parseStatement1() (*a.Node, error) {
if err != nil {
return nil, err
}
if (label != 0) && !p.parseEndwhile(label) {
return nil, fmt.Errorf(`parse: expected endwhile.%s at %s:%d`,
label.Str(p.tm), p.filename, p.line())
}
return a.NewWhile(label, condition, asserts, body).AsNode(), nil
}
return p.parseAssignNode()
+20 -18
View File
@@ -366,24 +366,25 @@ const (
IDConst = ID(0xA2)
IDContinue = ID(0xA3)
IDElse = ID(0xA4)
IDFunc = ID(0xA5)
IDIOBind = ID(0xA6)
IDIOLimit = ID(0xA7)
IDIf = ID(0xA8)
IDImplements = ID(0xA9)
IDInv = ID(0xAA)
IDIterate = ID(0xAB)
IDPost = ID(0xAC)
IDPre = ID(0xAD)
IDPri = ID(0xAE)
IDPub = ID(0xAF)
IDReturn = ID(0xB0)
IDStruct = ID(0xB1)
IDUse = ID(0xB2)
IDVar = ID(0xB3)
IDVia = ID(0xB4)
IDWhile = ID(0xB5)
IDYield = ID(0xB6)
IDEndwhile = ID(0xA5)
IDFunc = ID(0xA6)
IDIOBind = ID(0xA7)
IDIOLimit = ID(0xA8)
IDIf = ID(0xA9)
IDImplements = ID(0xAA)
IDInv = ID(0xAB)
IDIterate = ID(0xAC)
IDPost = ID(0xAD)
IDPre = ID(0xAE)
IDPri = ID(0xAF)
IDPub = ID(0xB0)
IDReturn = ID(0xB1)
IDStruct = ID(0xB2)
IDUse = ID(0xB3)
IDVar = ID(0xB4)
IDVia = ID(0xB5)
IDWhile = ID(0xB6)
IDYield = ID(0xB7)
)
const (
@@ -723,6 +724,7 @@ var builtInsByID = [nBuiltInIDs]string{
IDConst: "const",
IDContinue: "continue",
IDElse: "else",
IDEndwhile: "endwhile",
IDFunc: "func",
IDIOBind: "io_bind",
IDIOLimit: "io_limit",