diff --git a/lang/parse/parse.go b/lang/parse/parse.go index a52abcc5..6c369237 100644 --- a/lang/parse/parse.go +++ b/lang/parse/parse.go @@ -124,8 +124,8 @@ func (p *parser) parseIdent() (t.ID, error) { return 0, fmt.Errorf("parse: expected identifier at %s:%d", p.filename, p.line()) } x := p.src[0] - if !x.ID.IsIdent() { - name := p.m.ByKey(x.ID.Key()) + if !x.IsIdent() { + name := p.m.ByKey(x.Key()) return 0, fmt.Errorf("parse: expected identifier, got %q at %s:%d", name, p.filename, p.line()) } p.src = p.src[1:] diff --git a/lang/token/list.go b/lang/token/list.go index 9c06aae1..d65d33d3 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -39,13 +39,22 @@ type ID uint32 func (x ID) Key() Key { return Key(x >> idShift) } func (x ID) Flags() Flags { return Flags(x & idMask) } -func (x ID) IsUnaryOp() bool { return Flags(x)&FlagsUnaryOp != 0 } -func (x ID) IsBinaryOp() bool { return Flags(x)&FlagsBinaryOp != 0 } -func (x ID) IsAssociative() bool { return Flags(x)&FlagsAssociative != 0 } -func (x ID) IsAssign() bool { return Flags(x)&FlagsAssign != 0 } -func (x ID) IsLiteral() bool { return Flags(x)&FlagsLiteral != 0 } -func (x ID) IsIdent() bool { return Flags(x)&FlagsIdent != 0 } -func (x ID) IsImplicitSemicolon() bool { return Flags(x)&FlagsImplicitSemicolon != 0 } +// Token combines an ID and the line number it was seen. +type Token struct { + ID ID + Line uint32 +} + +func (t Token) Key() Key { return Key(t.ID >> idShift) } +func (t Token) Flags() Flags { return Flags(t.ID & idMask) } + +func (t Token) IsUnaryOp() bool { return Flags(t.ID)&FlagsUnaryOp != 0 } +func (t Token) IsBinaryOp() bool { return Flags(t.ID)&FlagsBinaryOp != 0 } +func (t Token) IsAssociative() bool { return Flags(t.ID)&FlagsAssociative != 0 } +func (t Token) IsAssign() bool { return Flags(t.ID)&FlagsAssign != 0 } +func (t Token) IsLiteral() bool { return Flags(t.ID)&FlagsLiteral != 0 } +func (t Token) IsIdent() bool { return Flags(t.ID)&FlagsIdent != 0 } +func (t Token) IsImplicitSemicolon() bool { return Flags(t.ID)&FlagsImplicitSemicolon != 0 } // nBuiltInKeys is the number of built-in Keys. The packing is: // - Zero is invalid. diff --git a/lang/token/token.go b/lang/token/token.go index 95d3c370..eab27b69 100644 --- a/lang/token/token.go +++ b/lang/token/token.go @@ -61,11 +61,6 @@ func (m *IDMap) ByKey(k Key) string { return "" } -type Token struct { - ID ID - Line uint32 -} - func alpha(c byte) bool { return ('A' <= c && c <= 'Z') || ('a' <= c && c <= 'z') || (c == '_') } @@ -102,7 +97,7 @@ loop: if c <= ' ' { if c == '\n' { - if len(tokens) > 0 && tokens[len(tokens)-1].ID.IsImplicitSemicolon() { + if len(tokens) > 0 && tokens[len(tokens)-1].IsImplicitSemicolon() { tokens = append(tokens, Token{IDSemicolon, line}) } if line == 1<<32-1 {