fspl/fspl
fspl/fspl
1
0
Fork 0
Code Issues 16 Pull Requests Packages Projects 1 Releases 6 Wiki Activity

implement-modules #43

Closed
sashakoshka wants to merge 502 commits from implement-modules into main
pull from: implement-modules
merge into: fspl:main
Conversation 0 Commits 502 Files Changed 134 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 79f51ce4c6 - Show all commits

8
parser/parser.go
View File

@ -60,8 +60,8 @@ func (this *Parser) expectDesc (description string, allowed ...lexer.TokenKind)
// expectValue returns an error if the current token's value does not match the // expectValue returns an error if the current token's value does not match the
// allowed values. // allowed values.
func (this *Parser) expectValue (allowed ...string) error { func (this *Parser) expectValue (kind lexer.TokenKind, allowed ...string) error {
if !this.token.ValueIs(allowed...) { if !this.token.Is(kind) || !this.token.ValueIs(allowed...){
return errors.Errorf ( return errors.Errorf (
this.token.Position, "expected %s", this.token.Position, "expected %s",
commaList(allowed)) commaList(allowed))
@ -71,8 +71,8 @@ func (this *Parser) expectValue (allowed ...string) error {
// expectValueDesc is like expectValue, but the expected value(s) are described // expectValueDesc is like expectValue, but the expected value(s) are described
// manually. // manually.
func (this *Parser) expectValueDesc (description string, allowed ...string) error { func (this *Parser) expectValueDesc (description string, kind lexer.TokenKind, allowed ...string) error {
if !this.token.ValueIs(allowed...) { if !this.token.Is(kind) || !this.token.ValueIs(allowed...) {
return errors.Errorf ( return errors.Errorf (
this.token.Position, "expected %s", this.token.Position, "expected %s",
description) description)