Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

parser: fix lexer that treat 9eTSs as a float #208

Merged
merged 5 commits into from Feb 14, 2019
Merged

parser: fix lexer that treat 9eTSs as a float #208

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
78bcd8d
parser: fix lexer that treat 9eTSs as a float
tiancaiamao Feb 14, 2019
5b58cd9
address comment
tiancaiamao Feb 14, 2019
56c60df
address comment
tiancaiamao Feb 14, 2019
0cfb155
Merge branch 'master' into fix-9eTSs
tiancaiamao Feb 14, 2019
a3c04de
address comment
tiancaiamao Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion lexer.go
View file
Open in desktop
Expand Up @@ -656,7 +656,13 @@ func startWithNumber(s *Scanner) (tok int, pos Pos, lit string) {
s.scanDigits()
ch0 = s.r.peek()
if ch0 == '.' || ch0 == 'e' || ch0 == 'E' {
return s.scanFloat(&pos)
s.r.inc()
ch1 := s.r.peek()
if isDigit(ch1) || ch1 == '+' || ch1 == '-' {
return s.scanFloat(&pos)
}
// 9eTSs is an identifier rather than number, fall through.
tok = identifier
}

// Identifiers may begin with a digit but unless quoted may not consist solely of digits.
Expand Down
3 changes: 3 additions & 0 deletions lexer_test.go
View file
Open in desktop
Expand Up @@ -113,6 +113,7 @@ func (s *testLexerSuite) TestLiteral(c *C) {
{"132.313", decLit},
{"132.3e231", floatLit},
{"132.3e-231", floatLit},
{"001e-12", floatLit},
{"23416", intLit},
{"123test", identifier},
{"123" + string(unicode.ReplacementChar) + "xxx", identifier},
Expand Down Expand Up @@ -232,6 +233,8 @@ func (s *testLexerSuite) TestIdentifier(c *C) {
{"1_x", "1_x"},
{"0_x", "0_x"},
{replacementString, replacementString},
{"9e", "9e"},
{"9eTSs", "9eTSs"},
tiancaiamao marked this conversation as resolved.
Show resolved Hide resolved
{fmt.Sprintf("t1%cxxx", 0), "t1"},
}
l := &Scanner{}
Expand Down