diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2016-09-08 09:18:17 +0800 |
|---|---|---|
| committer | Alex Beregszaszi <alex@rtfs.hu> | 2017-08-23 01:24:22 +0800 |
| commit | efe4d68a7bdc55fd79b9e01b863064b27528428a (patch) | |
| tree | 66fed23805dcf2dffdb2bc8509ddf077ac99e45d /libsolidity/parsing | |
| parent | 210b4870a805620329793c8ba2177a3ff6e7b477 (diff) | |
| download | dexon-solidity-efe4d68a7bdc55fd79b9e01b863064b27528428a.tar dexon-solidity-efe4d68a7bdc55fd79b9e01b863064b27528428a.tar.gz dexon-solidity-efe4d68a7bdc55fd79b9e01b863064b27528428a.tar.bz2 dexon-solidity-efe4d68a7bdc55fd79b9e01b863064b27528428a.tar.lz dexon-solidity-efe4d68a7bdc55fd79b9e01b863064b27528428a.tar.xz dexon-solidity-efe4d68a7bdc55fd79b9e01b863064b27528428a.tar.zst dexon-solidity-efe4d68a7bdc55fd79b9e01b863064b27528428a.zip | |
Introduce view (and keep constant as an alias)
Diffstat (limited to 'libsolidity/parsing')
| -rw-r--r-- | libsolidity/parsing/Parser.cpp | 3 | ||||
| -rw-r--r-- | libsolidity/parsing/Token.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp index 7455cbca..92a614e0 100644 --- a/libsolidity/parsing/Parser.cpp +++ b/libsolidity/parsing/Parser.cpp @@ -337,7 +337,8 @@ StateMutability Parser::parseStateMutability(Token::Value _token) StateMutability stateMutability(StateMutability::NonPayable); if (_token == Token::Payable) stateMutability = StateMutability::Payable; - else if (_token == Token::Constant) + // FIXME: constant should be removed at the next breaking release + else if (_token == Token::View || _token == Token::Constant) stateMutability = StateMutability::View; else solAssert(false, "Invalid state mutability specifier."); diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h index efbe5e9e..3bc52f1d 100644 --- a/libsolidity/parsing/Token.h +++ b/libsolidity/parsing/Token.h @@ -176,6 +176,7 @@ namespace solidity K(Throw, "throw", 0) \ K(Using, "using", 0) \ K(Var, "var", 0) \ + K(View, "view", 0) \ K(While, "while", 0) \ \ /* Ether subdenominations */ \ @@ -236,7 +237,6 @@ namespace solidity K(Try, "try", 0) \ K(Type, "type", 0) \ K(TypeOf, "typeof", 0) \ - K(View, "view", 0) \ /* Illegal token - not able to scan. */ \ T(Illegal, "ILLEGAL", 0) \ \ @@ -290,7 +290,7 @@ public: static bool isVisibilitySpecifier(Value op) { return isVariableVisibilitySpecifier(op) || op == External; } static bool isVariableVisibilitySpecifier(Value op) { return op == Public || op == Private || op == Internal; } static bool isLocationSpecifier(Value op) { return op == Memory || op == Storage; } - static bool isStateMutabilitySpecifier(Value op) { return op == Constant || op == Payable; } + static bool isStateMutabilitySpecifier(Value op) { return op == Constant || op == View || op == Payable; } static bool isEtherSubdenomination(Value op) { return op == SubWei || op == SubSzabo || op == SubFinney || op == SubEther; } static bool isTimeSubdenomination(Value op) { return op == SubSecond || op == SubMinute || op == SubHour || op == SubDay || op == SubWeek || op == SubYear; } static bool isReservedKeyword(Value op) { return (Abstract <= op && op <= TypeOf); } |