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

scanner: organize Scan() so it's easier to read

Browse Source
This commit is contained in:
Fatih Arslan 2015-10-04 22:53:20 +03:00
parent aa9105226b
commit 9629512599
2 changed files with 69 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scanner/scanner.go
View File

@ -104,25 +104,25 @@ func (s *Scanner) Scan() (tok token.Token) {
s.tokBuf.Reset()
s.tokPos = s.currPos.Offset - s.lastCharLen
if isLetter(ch) {
switch {
case isLetter(ch):
tok = token.IDENT
lit := s.scanIdentifier()
if lit == "true" || lit == "false" {
tok = token.BOOL
}
}
if isDigit(ch) {
case isDigit(ch):
s.scanNumber()
// TODO(arslan)
}
switch ch {
case eof:
tok = token.EOF
case '"':
tok = token.STRING
s.scanString()
default:
switch ch {
case eof:
tok = token.EOF
case '"':
tok = token.STRING
s.scanString()
}
}
s.tokEnd = s.currPos.Offset

58
scanner/scanner_test.go
View File

@ -98,3 +98,61 @@ func TestString(t *testing.T) {
testTokenList(t, tokenList)
}
func TestNumber(t *testing.T) {
t.SkipNow()
var tokenList = []tokenPair{
{token.NUMBER, "0"},
{token.NUMBER, "1"},
{token.NUMBER, "9"},
{token.NUMBER, "42"},
{token.NUMBER, "1234567890"},
{token.NUMBER, "00"},
{token.NUMBER, "01"},
{token.NUMBER, "07"},
{token.NUMBER, "042"},
{token.NUMBER, "01234567"},
{token.NUMBER, "0x0"},
{token.NUMBER, "0x1"},
{token.NUMBER, "0xf"},
{token.NUMBER, "0x42"},
{token.NUMBER, "0x123456789abcDEF"},
{token.NUMBER, "0x" + f100},
{token.NUMBER, "0X0"},
{token.NUMBER, "0X1"},
{token.NUMBER, "0XF"},
{token.NUMBER, "0X42"},
{token.NUMBER, "0X123456789abcDEF"},
{token.NUMBER, "0X" + f100},
{token.FLOAT, "0."},
{token.FLOAT, "1."},
{token.FLOAT, "42."},
{token.FLOAT, "01234567890."},
{token.FLOAT, ".0"},
{token.FLOAT, ".1"},
{token.FLOAT, ".42"},
{token.FLOAT, ".0123456789"},
{token.FLOAT, "0.0"},
{token.FLOAT, "1.0"},
{token.FLOAT, "42.0"},
{token.FLOAT, "01234567890.0"},
{token.FLOAT, "0e0"},
{token.FLOAT, "1e0"},
{token.FLOAT, "42e0"},
{token.FLOAT, "01234567890e0"},
{token.FLOAT, "0E0"},
{token.FLOAT, "1E0"},
{token.FLOAT, "42E0"},
{token.FLOAT, "01234567890E0"},
{token.FLOAT, "0e+10"},
{token.FLOAT, "1e-10"},
{token.FLOAT, "42e+10"},
{token.FLOAT, "01234567890e-10"},
{token.FLOAT, "0E+10"},
{token.FLOAT, "1E-10"},
{token.FLOAT, "42E+10"},
{token.FLOAT, "01234567890E-10"},
}
testTokenList(t, tokenList)
}