Skip to content

Commit

Permalink
Fix staticlint issue
Browse files Browse the repository at this point in the history
  • Loading branch information
thallgren committed Apr 21, 2020
1 parent 06f2f78 commit 485bf0b
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions parser/lexer.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,10 @@ type Token struct {
}

func tokenString(t *Token) (s string) {
tt := t.Type
if t == nil || tt == end {
if t == nil || t.Type == end {
return "EOT"
}
switch tt {
switch t.Type {
case identifier, integer, float, dotdot, dotdotdot:
s = t.Value
case regexpLiteral:
Expand All @@ -96,12 +95,13 @@ func badToken(r rune) error {
return fmt.Errorf("unexpected character '%c'", r)
}

func nextToken(sr *util.StringReader) (t *Token) {
func nextToken(sr *util.StringReader) *Token {
for {
var t *Token
r := sr.Next()
switch r {
case 0:
return &Token{``, end}
t = &Token{``, end}
case ' ', '\t', '\n':
continue
case '`':
Expand Down Expand Up @@ -132,13 +132,12 @@ func nextToken(sr *util.StringReader) (t *Token) {
util.WriteRune(buf, r)
}
tkn := ConsumeNumber(sr, n, buf, integer)
return &Token{buf.String(), tkn}
t = &Token{buf.String(), tkn}
default:
t = buildToken(r, sr)
}
break
return t
}
return t
}

func buildToken(r rune, sr *util.StringReader) *Token {
Expand Down

0 comments on commit 485bf0b

Please sign in to comment.