diff options
| author | chriseth <chris@ethereum.org> | 2017-08-09 20:53:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 20:53:53 +0800 |
| commit | a4e39592c71b6b133fd702f7dafef234add4712c (patch) | |
| tree | 8e33bd5e38492cb40bdbe36b914382bb0e0ed38b | |
| parent | 4b0ea1fba071a0c874c592912c8eaa5706847487 (diff) | |
| parent | 3b41cd3c23d346c7b7367bd80fd6381bbb329587 (diff) | |
| download | dexon-solidity-a4e39592c71b6b133fd702f7dafef234add4712c.tar dexon-solidity-a4e39592c71b6b133fd702f7dafef234add4712c.tar.gz dexon-solidity-a4e39592c71b6b133fd702f7dafef234add4712c.tar.bz2 dexon-solidity-a4e39592c71b6b133fd702f7dafef234add4712c.tar.lz dexon-solidity-a4e39592c71b6b133fd702f7dafef234add4712c.tar.xz dexon-solidity-a4e39592c71b6b133fd702f7dafef234add4712c.tar.zst dexon-solidity-a4e39592c71b6b133fd702f7dafef234add4712c.zip | |
Merge pull request #2719 from ethereum/constant
Rename Token::Const to Token::Constant
| -rw-r--r-- | libsolidity/parsing/Parser.cpp | 4 | ||||
| -rw-r--r-- | libsolidity/parsing/Token.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp index b98991f3..bc004d14 100644 --- a/libsolidity/parsing/Parser.cpp +++ b/libsolidity/parsing/Parser.cpp @@ -321,7 +321,7 @@ Parser::FunctionHeaderParserResult Parser::parseFunctionHeader(bool _forceEmptyN while (true) { Token::Value token = m_scanner->currentToken(); - if (token == Token::Const) + if (token == Token::Constant) { if (result.isDeclaredConst) parserError(string("Multiple \"constant\" specifiers.")); @@ -522,7 +522,7 @@ ASTPointer<VariableDeclaration> Parser::parseVariableDeclaration( { if (_options.allowIndexed && token == Token::Indexed) isIndexed = true; - else if (token == Token::Const) + else if (token == Token::Constant) isDeclaredConst = true; else if (_options.allowLocationSpecifier && Token::isLocationSpecifier(token)) { diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h index d412b3f0..468cbcb7 100644 --- a/libsolidity/parsing/Token.h +++ b/libsolidity/parsing/Token.h @@ -143,7 +143,7 @@ namespace solidity K(As, "as", 0) \ K(Assembly, "assembly", 0) \ K(Break, "break", 0) \ - K(Const, "constant", 0) \ + K(Constant, "constant", 0) \ K(Continue, "continue", 0) \ K(Contract, "contract", 0) \ K(Do, "do", 0) \ |