Add choosy

This commit is contained in:
Nigel Tao committed 2021-01-04 23:20:41 +11:00
1 parent 1b83476575
commit 81c6437e09
8 files changed
+223 -49

No files matched your search

+2
View File
@@ -103,6 +103,7 @@ const (
FlagsSubExprHasEffect = Flags(0x00002000)
FlagsRetsError = Flags(0x00004000)
FlagsPrivateData = Flags(0x00008000)
FlagsChoosy = Flags(0x00010000)
)
func (f Flags) AsEffect() Effect { return Effect(f) }
@@ -869,6 +870,7 @@ const MaxBodyDepth = 255
type Func Node
func (n *Func) AsNode() *Node { return (*Node)(n) }
func (n *Func) Choosy() bool { return n.flags&FlagsChoosy != 0 }
func (n *Func) Effect() Effect { return Effect(n.flags) }
func (n *Func) Public() bool { return n.flags&FlagsPublic != 0 }
func (n *Func) Filename() string { return n.filename }
+20 -1
View File
@@ -217,7 +217,7 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
return nil, err
}
out := (*a.TypeExpr)(nil)
if p.peek1() != t.IDOpenCurly {
if x := p.peek1(); (x != t.IDOpenCurly) && (x != t.IDComma) {
out, err = p.parseTypeExpr()
if err != nil {
return nil, err
@@ -226,6 +226,25 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
asserts := []*a.Node(nil)
if p.peek1() == t.IDComma {
p.src = p.src[1:]
if p.peek1() == t.IDChoosy {
p.src = p.src[1:]
if (flags & a.FlagsPublic) != 0 {
return nil, fmt.Errorf(`parse: choosy function cannot be pub at %s:%d`,
p.filename, p.line())
} else if p.funcEffect.Coroutine() {
return nil, fmt.Errorf(`parse: choosy function cannot be a coroutine at %s:%d`,
p.filename, p.line())
}
flags |= a.FlagsChoosy
if p.peek1() != t.IDOpenCurly {
if x := p.peek1(); x != t.IDComma {
return nil, fmt.Errorf(`parse: expected ",", got %q at %s:%d`,
p.tm.ByID(x), p.filename, p.line())
}
p.src = p.src[1:]
}
}
asserts, err = p.parseList(t.IDOpenCurly, (*parser).parseAssertNode)
if err != nil {
return nil, err
+26 -22
View File
@@ -375,28 +375,30 @@ const (
IDAssert = ID(0xB0)
IDBreak = ID(0xB1)
IDConst = ID(0xB2)
IDContinue = ID(0xB3)
IDElse = ID(0xB4)
IDEndwhile = ID(0xB5)
IDFunc = ID(0xB6)
IDIOBind = ID(0xB7)
IDIOLimit = ID(0xB8)
IDIf = ID(0xB9)
IDImplements = ID(0xBA)
IDInv = ID(0xBB)
IDIterate = ID(0xBC)
IDPost = ID(0xBD)
IDPre = ID(0xBE)
IDPri = ID(0xBF)
IDPub = ID(0xC0)
IDReturn = ID(0xC1)
IDStruct = ID(0xC2)
IDUse = ID(0xC3)
IDVar = ID(0xC4)
IDVia = ID(0xC5)
IDWhile = ID(0xC6)
IDYield = ID(0xC7)
IDChoose = ID(0xB2)
IDChoosy = ID(0xB3)
IDConst = ID(0xB4)
IDContinue = ID(0xB5)
IDElse = ID(0xB6)
IDEndwhile = ID(0xB7)
IDFunc = ID(0xB8)
IDIOBind = ID(0xB9)
IDIOLimit = ID(0xBA)
IDIf = ID(0xBB)
IDImplements = ID(0xBC)
IDInv = ID(0xBD)
IDIterate = ID(0xBE)
IDPost = ID(0xBF)
IDPre = ID(0xC0)
IDPri = ID(0xC1)
IDPub = ID(0xC2)
IDReturn = ID(0xC3)
IDStruct = ID(0xC4)
IDUse = ID(0xC5)
IDVar = ID(0xC6)
IDVia = ID(0xC7)
IDWhile = ID(0xC8)
IDYield = ID(0xC9)
)
const (
@@ -743,6 +745,8 @@ var builtInsByID = [nBuiltInIDs]string{
IDAssert: "assert",
IDBreak: "break",
IDChoose: "choose",
IDChoosy: "choosy",
IDConst: "const",
IDContinue: "continue",
IDElse: "else",