cerc-io/solidity
16
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

Merge pull request #2719 from ethereum/constant

Browse Source 
Rename Token::Const to Token::Constant
This commit is contained in:
chriseth 2017-08-09 14:53:53 +02:00 committed by GitHub
commit a4e39592c7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/parsing/Parser.cpp
View File

@ -321,7 +321,7 @@ Parser::FunctionHeaderParserResult Parser::parseFunctionHeader(bool _forceEmptyN
while (true) while (true)
{ {
Token::Value token = m_scanner->currentToken(); Token::Value token = m_scanner->currentToken();
if (token == Token::Const) if (token == Token::Constant)
{ {
if (result.isDeclaredConst) if (result.isDeclaredConst)
parserError(string("Multiple \"constant\" specifiers.")); parserError(string("Multiple \"constant\" specifiers."));
@ -522,7 +522,7 @@ ASTPointer<VariableDeclaration> Parser::parseVariableDeclaration(
{ {
if (_options.allowIndexed && token == Token::Indexed) if (_options.allowIndexed && token == Token::Indexed)
isIndexed = true; isIndexed = true;
else if (token == Token::Const) else if (token == Token::Constant)
isDeclaredConst = true; isDeclaredConst = true;
else if (_options.allowLocationSpecifier && Token::isLocationSpecifier(token)) else if (_options.allowLocationSpecifier && Token::isLocationSpecifier(token))
{ {

2
libsolidity/parsing/Token.h
View File

@ -143,7 +143,7 @@ namespace solidity
K(As, "as", 0) \ K(As, "as", 0) \
K(Assembly, "assembly", 0) \ K(Assembly, "assembly", 0) \
K(Break, "break", 0) \ K(Break, "break", 0) \
K(Const, "constant", 0) \ K(Constant, "constant", 0) \
K(Continue, "continue", 0) \ K(Continue, "continue", 0) \
K(Contract, "contract", 0) \ K(Contract, "contract", 0) \
K(Do, "do", 0) \ K(Do, "do", 0) \