Skip to content

Add support for "NaN" as a double value #595

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

Merged
dj2 merged 6 commits into from
Jul 25, 2019
Merged

Add support for "NaN" as a double value #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c96bcec
Add support for "NaN" as a double when tokenizing
rg3igalia Jul 24, 2019
d5c3def
Add a unit test for NaN double values
rg3igalia Jul 24, 2019
303b3c8
Fix formatter issues.
dj2 Jul 24, 2019
8a77d1e
Merge branch 'master' into nan_support
dj2 Jul 24, 2019
d3b5024
More formatting
dj2 Jul 25, 2019
c38dbed
Formatting
dj2 Jul 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/tokenizer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,15 @@ std::unique_ptr<Token> Tokenizer::NextToken() {
data_.substr(current_position_, end_pos - current_position_);
current_position_ = end_pos;

// Check for "NaN" explicitly.
bool is_nan =
(tok_str.size() == 3 && std::tolower(tok_str[0]) == 'n' &&
std::tolower(tok_str[1]) == 'a' && std::tolower(tok_str[2]) == 'n');

// Starts with an alpha is a string.
if (!std::isdigit(tok_str[0]) &&
!(tok_str[0] == '-' && std::isdigit(tok_str[1])) &&
!(tok_str[0] == '.' && std::isdigit(tok_str[1]))) {
if (!is_nan && !std::isdigit(tok_str[0]) &&
!(tok_str[0] == '-' && tok_str.size() >= 2 && std::isdigit(tok_str[1])) &&
!(tok_str[0] == '.' && tok_str.size() >= 2 && std::isdigit(tok_str[1]))) {
// If we've got a continuation, skip over the end of line and get the next
// token.
if (tok_str == "\\") {
Expand All @@ -126,17 +131,21 @@ std::unique_ptr<Token> Tokenizer::NextToken() {
}

// Handle hex strings
if (tok_str.size() > 2 && tok_str[0] == '0' && tok_str[1] == 'x') {
if (!is_nan && tok_str.size() > 2 && tok_str[0] == '0' && tok_str[1] == 'x') {
auto tok = MakeUnique<Token>(TokenType::kHex);
tok->SetStringValue(tok_str);
return tok;
}

bool is_double = false;
for (const char ch : tok_str) {
if (ch == '.') {
is_double = true;
break;
if (is_nan) {
is_double = true;
} else {
for (const char ch : tok_str) {
if (ch == '.') {
is_double = true;
break;
}
}
}

Expand Down
28 changes: 28 additions & 0 deletions src/tokenizer_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

#include "src/tokenizer.h"

#include <cmath>
#include <limits>

#include "gtest/gtest.h"
Expand Down Expand Up @@ -77,6 +78,33 @@ TEST_F(TokenizerTest, ProcessDouble) {
EXPECT_TRUE(next->IsEOS());
}

namespace {

void TestNaN(const std::string& nan_str) {
Tokenizer t(nan_str);
auto next = t.NextToken();
ASSERT_TRUE(next != nullptr);
EXPECT_TRUE(next->IsDouble());
EXPECT_TRUE(std::isnan(next->AsDouble()));

next = t.NextToken();
ASSERT_TRUE(next != nullptr);
EXPECT_TRUE(next->IsEOS());
}

} // namespace

TEST_F(TokenizerTest, ProcessNaN) {
TestNaN("nan");
TestNaN("naN");
TestNaN("nAn");
TestNaN("nAN");
TestNaN("Nan");
TestNaN("NaN");
TestNaN("NAn");
TestNaN("NAN");
}

TEST_F(TokenizerTest, ProcessNegativeDouble) {
Tokenizer t("-123.456");
auto next = t.NextToken();
Expand Down