go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

parser: more idiomatic call

Browse Source
This commit is contained in:
Fatih Arslan 2015-10-04 01:35:29 +03:00
parent c859b8a1a4
commit 3bf9d71be5
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
parser/lexer.go
View File

@ -82,8 +82,8 @@ func (s *Scanner) peek() rune {
return peek
}
// Scan scans the next token and returns the token and it's literal string.
func (s *Scanner) Scan() (tok Token, lit string) {
// Scan scans the next token and returns the token.
func (s *Scanner) Scan() (tok Token) {
ch := s.next()
// skip white space
@ -97,7 +97,7 @@ func (s *Scanner) Scan() (tok Token, lit string) {
if isLetter(ch) {
tok = IDENT
lit = s.scanIdentifier()
lit := s.scanIdentifier()
if lit == "true" || lit == "false" {
tok = BOOL
}
@ -117,7 +117,7 @@ func (s *Scanner) Scan() (tok Token, lit string) {
}
s.tokEnd = s.currPos.Offset
return tok, s.TokenLiteral()
return tok
}
func (s *Scanner) scanString() {
@ -152,9 +152,9 @@ func (s *Scanner) scanIdentifier() string {
return string(s.srcBytes[offs:s.currPos.Offset])
}
// TokenLiteral returns the literal string corresponding to the most recently
// TokenText returns the literal string corresponding to the most recently
// scanned token.
func (s *Scanner) TokenLiteral() string {
func (s *Scanner) TokenText() string {
if s.tokPos < 0 {
// no token text
return ""

12
parser/lexer_test.go
View File

@ -31,12 +31,12 @@ func TestBool(t *testing.T) {
}
for _, ident := range tokenList {
tok, lit := l.Scan()
tok := l.Scan()
if tok != ident.tok {
t.Errorf("tok = %s want %s for %s\n", tok, ident.tok, ident.text)
}
if lit != ident.text {
if l.TokenText() != ident.text {
t.Errorf("text = %s want %s", lit, ident.text)
}
@ -75,12 +75,12 @@ func TestIdent(t *testing.T) {
}
for _, ident := range tokenList {
tok, lit := l.Scan()
tok := l.Scan()
if tok != ident.tok {
t.Errorf("tok = %s want %s for %s\n", tok, ident.tok, ident.text)
}
if lit != ident.text {
if l.TokenText() != ident.text {
t.Errorf("text = %s want %s", lit, ident.text)
}
@ -123,12 +123,12 @@ func TestString(t *testing.T) {
}
for _, ident := range tokenList {
tok, lit := l.Scan()
tok := l.Scan()
if tok != ident.tok {
t.Errorf("tok = %s want %s for %s\n", tok, ident.tok, ident.text)
}
if lit != ident.text {
if l.TokenText() != ident.text {
t.Errorf("text = %s want %s", lit, ident.text)
}