mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Parse "pub" and "pri".
This commit is contained in:
1 parent
849f885993
commit
c437bf258e
5 files changed
+105
-89
No files matched your search
+6
-1
@@ -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: <Struct> 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: <Field> 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 }
|
||||
|
||||
@@ -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 {
|
||||
|
||||
+88
-83
@@ -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".
|
||||
|
||||
@@ -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<<KeyShift | FlagsOther)
|
||||
IDPost = ID(0x6E<<KeyShift | FlagsOther)
|
||||
IDVia = ID(0x6F<<KeyShift | FlagsOther)
|
||||
IDPub = ID(0x70<<KeyShift | FlagsOther)
|
||||
IDPri = ID(0x71<<KeyShift | FlagsOther)
|
||||
|
||||
IDFalse = ID(0x90<<KeyShift | FlagsLiteral | FlagsImplicitSemicolon)
|
||||
IDTrue = ID(0x91<<KeyShift | FlagsLiteral | FlagsImplicitSemicolon)
|
||||
@@ -455,6 +459,8 @@ var builtInsByKey = [nBuiltInKeys]struct {
|
||||
KeyPre: {"pre", IDPre},
|
||||
KeyPost: {"post", IDPost},
|
||||
KeyVia: {"via", IDVia},
|
||||
KeyPub: {"pub", IDPub},
|
||||
KeyPri: {"pri", IDPri},
|
||||
|
||||
KeyFalse: {"false", IDFalse},
|
||||
KeyTrue: {"true", IDTrue},
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
use "std/io"
|
||||
|
||||
struct lzw_decoder?(
|
||||
pub struct lzw_decoder?(
|
||||
// TODO: default values??
|
||||
literal_width u32[2..8],
|
||||
stack[4096] u8,
|
||||
@@ -8,7 +8,7 @@ struct lzw_decoder?(
|
||||
prefixes[4096] u16,
|
||||
)
|
||||
|
||||
func lzw_decoder.decode?(dst ptr io.buf1, src ptr io.buf1, src_final bool)() {
|
||||
pub func lzw_decoder.decode?(dst ptr io.buf1, src ptr io.buf1, src_final bool)() {
|
||||
var bits u32
|
||||
var n_bits u32
|
||||
|
||||
|
||||
Reference in new issue
Block a user