Commit f70d131f authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[2506] resolved remaining conflicts on rebase

parent b991213a
......@@ -495,11 +495,11 @@ Number::handle(MasterLexer& lexer) const {
try {
const uint32_t number32 =
boost::lexical_cast<uint32_t, const char*>(&data[0]);
token = MasterLexer::Token(number32);
token = MasterToken(number32);
} catch (const boost::bad_lexical_cast&) {
// Since we already know we have only digits,
// range should be the only possible problem.
token = Token(MasterToken::NUMBER_OUT_OF_RANGE);
token = MasterToken(MasterToken::NUMBER_OUT_OF_RANGE);
}
} else {
token = MasterToken(&data.at(0), data.size());
......
......@@ -139,7 +139,7 @@ TEST_F(MasterLexerTokenTest, errors) {
EXPECT_EQ("no token produced", MasterToken(MasterToken::NO_TOKEN_PRODUCED).
getErrorText());
EXPECT_EQ("number out of range",
MasterLexer::Token(MasterToken::NUMBER_OUT_OF_RANGE).
MasterToken(MasterToken::NUMBER_OUT_OF_RANGE).
getErrorText());
// getErrorCode/Text() isn't allowed for non number types
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment