diff --git a/lang/ast/ast.go b/lang/ast/ast.go index f98211ab..c373fc78 100644 --- a/lang/ast/ast.go +++ b/lang/ast/ast.go @@ -70,7 +70,8 @@ type Flags uint32 const ( FlagsImpure = Flags(0x00000001) FlagsSuspendible = Flags(0x00000002) - FlagsTypeChecked = Flags(0x00000004) + FlagsPublic = Flags(0x00000004) + FlagsTypeChecked = Flags(0x00000008) ) type Node struct { @@ -442,6 +443,7 @@ func NewTypeExpr(pkgOrDec t.ID, name t.ID, arrayLengthMin *Expr, max *Expr, inne // Func is "func ID0.ID1(LHS)(RHS) { List1 }": // - FlagsImpure is "ID1" vs "ID1!" // - FlagsSuspendible is "ID1" vs "ID1?", it implies FlagsImpure +// - FlagsPublic is "pub" vs "pri" // - ID0: <0|receiver> // - ID1: name // - LHS: in-parameters @@ -453,6 +455,7 @@ type Func Node func (n *Func) Node() *Node { return (*Node)(n) } func (n *Func) Impure() bool { return n.flags&FlagsImpure != 0 } func (n *Func) Suspendible() bool { return n.flags&FlagsSuspendible != 0 } +func (n *Func) Public() bool { return n.flags&FlagsPublic != 0 } func (n *Func) Filename() string { return n.filename } func (n *Func) Line() uint32 { return n.line } func (n *Func) QID() t.QID { return t.QID{n.id0, n.id1} } @@ -480,12 +483,14 @@ func NewFunc(flags Flags, filename string, line uint32, receiver t.ID, name t.ID // Struct is "struct ID1(List0)": // - FlagsSuspendible is "ID1" vs "ID1?" +// - FlagsPublic is "pub" vs "pri" // - ID1: name // - List0: fields type Struct Node func (n *Struct) Node() *Node { return (*Node)(n) } func (n *Struct) Suspendible() bool { return n.flags&FlagsSuspendible != 0 } +func (n *Struct) Public() bool { return n.flags&FlagsPublic != 0 } func (n *Struct) Filename() string { return n.filename } func (n *Struct) Line() uint32 { return n.line } func (n *Struct) Name() t.ID { return n.id1 } diff --git a/lang/check/check_test.go b/lang/check/check_test.go index eec6dc58..88ff8744 100644 --- a/lang/check/check_test.go +++ b/lang/check/check_test.go @@ -46,11 +46,11 @@ func compareToPuffsfmt(idMap *token.IDMap, tokens []token.Token, src string) err func TestCheck(t *testing.T) { const filename = "test.puffs" src := strings.TrimSpace(` - struct foo( + pri struct foo( i i32, ) - func foo.bar()() { + pri func foo.bar()() { var x u8 var y i32 = +2 var z u64[..123] @@ -176,7 +176,7 @@ func TestConstValues(t *testing.T) { idMap := &token.IDMap{} for s, wantInt64 := range testCases { - src := "func foo()() {\n\t" + s + "\n}\n" + src := "pri func foo()() {\n\t" + s + "\n}\n" tokens, _, err := token.Tokenize(idMap, filename, []byte(src)) if err != nil { diff --git a/lang/parse/parse.go b/lang/parse/parse.go index b1f208ac..039bd972 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -70,89 +70,9 @@ func (p *parser) parseFile() (*a.File, error) { } func (p *parser) parseTopLevelDecl() (*a.Node, error) { + flags := a.Flags(0) line := p.src[0].Line - switch p.src[0].ID.Key() { - case t.KeyFunc: - flags := a.Flags(0) - p.src = p.src[1:] - id0, id1, err := p.parseQualifiedIdent() - if err != nil { - return nil, err - } - if id0 != 0 && id0.IsBuiltIn() { - return nil, fmt.Errorf(`parse: built-in %q used for func receiver at %s:%d`, - p.m.ByID(id0), p.filename, p.line()) - } - if id1.IsBuiltIn() { - return nil, fmt.Errorf(`parse: built-in %q used for func name at %s:%d`, - p.m.ByID(id1), p.filename, p.line()) - } - switch p.peek1().Key() { - case t.KeyExclam: - flags |= a.FlagsImpure - p.src = p.src[1:] - case t.KeyQuestion: - flags |= a.FlagsImpure | a.FlagsSuspendible - p.src = p.src[1:] - } - inFields, err := p.parseList(t.KeyCloseParen, (*parser).parseFieldNode) - if err != nil { - return nil, err - } - outFields, err := p.parseList(t.KeyCloseParen, (*parser).parseFieldNode) - if err != nil { - return nil, err - } - asserts := []*a.Node(nil) - if p.peek1().Key() == t.KeyComma { - p.src = p.src[1:] - asserts, err = p.parseList(t.KeyOpenCurly, (*parser).parseAssertNode) - if err != nil { - return nil, err - } - if err := p.assertsSorted(asserts); err != nil { - return nil, err - } - } - body, err := p.parseBlock() - if err != nil { - return nil, err - } - if x := p.peek1().Key(); x != t.KeySemicolon { - got := p.m.ByKey(x) - return nil, fmt.Errorf(`parse: expected (implicit) ";", got %q at %s:%d`, got, p.filename, p.line()) - } - p.src = p.src[1:] - in := a.NewStruct(0, p.filename, line, t.IDIn, inFields) - out := a.NewStruct(0, p.filename, line, t.IDOut, outFields) - return a.NewFunc(flags, p.filename, line, id0, id1, in, out, asserts, body).Node(), nil - - case t.KeyStruct: - flags := a.Flags(0) - p.src = p.src[1:] - name, err := p.parseIdent() - if err != nil { - return nil, err - } - if name.IsBuiltIn() { - return nil, fmt.Errorf(`parse: built-in %q used for struct name at %s:%d`, - p.m.ByID(name), p.filename, p.line()) - } - if p.peek1().Key() == t.KeyQuestion { - flags |= a.FlagsSuspendible - p.src = p.src[1:] - } - fields, err := p.parseList(t.KeyCloseParen, (*parser).parseFieldNode) - if err != nil { - return nil, err - } - if x := p.peek1().Key(); x != t.KeySemicolon { - got := p.m.ByKey(x) - return nil, fmt.Errorf(`parse: expected (implicit) ";", got %q at %s:%d`, got, p.filename, p.line()) - } - p.src = p.src[1:] - return a.NewStruct(flags, p.filename, line, name, fields).Node(), nil - + switch p.peek1().Key() { case t.KeyUse: p.src = p.src[1:] path := p.peek1() @@ -168,8 +88,93 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) { p.src = p.src[1:] return a.NewUse(p.filename, line, path).Node(), nil + case t.KeyPub: + flags |= a.FlagsPublic + fallthrough + case t.KeyPri: + p.src = p.src[1:] + switch p.peek1().Key() { + case t.KeyFunc: + p.src = p.src[1:] + id0, id1, err := p.parseQualifiedIdent() + if err != nil { + return nil, err + } + if id0 != 0 && id0.IsBuiltIn() { + return nil, fmt.Errorf(`parse: built-in %q used for func receiver at %s:%d`, + p.m.ByID(id0), p.filename, p.line()) + } + if id1.IsBuiltIn() { + return nil, fmt.Errorf(`parse: built-in %q used for func name at %s:%d`, + p.m.ByID(id1), p.filename, p.line()) + } + switch p.peek1().Key() { + case t.KeyExclam: + flags |= a.FlagsImpure + p.src = p.src[1:] + case t.KeyQuestion: + flags |= a.FlagsImpure | a.FlagsSuspendible + p.src = p.src[1:] + } + inFields, err := p.parseList(t.KeyCloseParen, (*parser).parseFieldNode) + if err != nil { + return nil, err + } + outFields, err := p.parseList(t.KeyCloseParen, (*parser).parseFieldNode) + if err != nil { + return nil, err + } + asserts := []*a.Node(nil) + if p.peek1().Key() == t.KeyComma { + p.src = p.src[1:] + asserts, err = p.parseList(t.KeyOpenCurly, (*parser).parseAssertNode) + if err != nil { + return nil, err + } + if err := p.assertsSorted(asserts); err != nil { + return nil, err + } + } + body, err := p.parseBlock() + if err != nil { + return nil, err + } + if x := p.peek1().Key(); x != t.KeySemicolon { + got := p.m.ByKey(x) + return nil, fmt.Errorf(`parse: expected (implicit) ";", got %q at %s:%d`, got, p.filename, p.line()) + } + p.src = p.src[1:] + in := a.NewStruct(0, p.filename, line, t.IDIn, inFields) + out := a.NewStruct(0, p.filename, line, t.IDOut, outFields) + return a.NewFunc(flags, p.filename, line, id0, id1, in, out, asserts, body).Node(), nil + + case t.KeyStruct: + p.src = p.src[1:] + name, err := p.parseIdent() + if err != nil { + return nil, err + } + if name.IsBuiltIn() { + return nil, fmt.Errorf(`parse: built-in %q used for struct name at %s:%d`, + p.m.ByID(name), p.filename, p.line()) + } + if p.peek1().Key() == t.KeyQuestion { + flags |= a.FlagsSuspendible + p.src = p.src[1:] + } + fields, err := p.parseList(t.KeyCloseParen, (*parser).parseFieldNode) + if err != nil { + return nil, err + } + if x := p.peek1().Key(); x != t.KeySemicolon { + got := p.m.ByKey(x) + return nil, fmt.Errorf(`parse: expected (implicit) ";", got %q at %s:%d`, got, p.filename, p.line()) + } + p.src = p.src[1:] + return a.NewStruct(flags, p.filename, line, name, fields).Node(), nil + } } - return nil, fmt.Errorf(`parse: unrecognized top level declaration at %s:%d`, p.filename, p.src[0].Line) + return nil, fmt.Errorf(`parse: unrecognized top level declaration at %s:%d`, p.filename, line) } // parseQualifiedIdent parses "foo.bar" or "bar". diff --git a/lang/token/list.go b/lang/token/list.go index d54e6a25..579d40f1 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -197,6 +197,8 @@ const ( KeyPre = Key(IDPre >> KeyShift) KeyPost = Key(IDPost >> KeyShift) KeyVia = Key(IDVia >> KeyShift) + KeyPub = Key(IDPub >> KeyShift) + KeyPri = Key(IDPri >> KeyShift) KeyFalse = Key(IDFalse >> KeyShift) KeyTrue = Key(IDTrue >> KeyShift) @@ -323,6 +325,8 @@ const ( IDPre = ID(0x6D<