cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added keyword type and some tests, changes in lexical cast

Browse Source
This commit is contained in:
RJ Catalano
2016-03-11 17:50:09 +01:00
committed by chriseth
parent d0bb87ae88
commit d0054a8d29
3 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libsolidity/parsing/Token.cpp
+8 -8
View File
@@ -109,26 +109,26 @@ char const Token::m_tokenType[] =
{
TOKEN_LIST(KT, KK)
};
unsigned Token::extractUnsigned(string::const_iterator _begin, string::const_iterator _end)
int Token::parseSize(string::const_iterator _begin, string::const_iterator _end)
{
try
{
unsigned short m = boost::lexical_cast<unsigned short>(boost::make_iterator_range(_begin, _end));
unsigned int m = boost::lexical_cast<int>(boost::make_iterator_range(_begin, _end));
return m;
}
catch(const boost::bad_lexical_cast &)
catch(boost::bad_lexical_cast const&)
{
return 0;
return -1;
}
}
tuple<Token::Value, unsigned short, unsigned short> Token::fromIdentifierOrKeyword(string const& _literal)
tuple<Token::Value, unsigned int, unsigned int> Token::fromIdentifierOrKeyword(string const& _literal)
{
auto positionM = find_if(_literal.begin(), _literal.end(), ::isdigit);
if (positionM != _literal.end())
{
string baseType(_literal.begin(), positionM);
auto positionX = find_if_not(positionM, _literal.end(), ::isdigit);
unsigned short m = extractUnsigned(positionM, positionX);
int m = parseSize(positionM, positionX);
Token::Value keyword = keywordByName(baseType);
if (keyword == Token::Bytes)
{
@@ -147,8 +147,8 @@ tuple<Token::Value, unsigned short, unsigned short> Token::fromIdentifierOrKeywo
}
else if (keyword == Token::UFixed || keyword == Token::Fixed)
{
auto positionN = find_if_not(positionX++, _literal.end(), ::isdigit);
unsigned short n = extractUnsigned(positionX++, positionN);
auto positionN = find_if_not(++positionX, _literal.end(), ::isdigit);
int n = parseSize(++positionX, positionN);
if (
0 < m + n &&
m + n <= 256 &&