diff options
| author | chriseth <chris@ethereum.org> | 2016-09-06 19:35:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-06 19:35:52 +0800 |
| commit | afca2acb779746fc3ee12391137a133cbcec8d3b (patch) | |
| tree | 273e52108639b0b2a1629845fadf57bf15199607 | |
| parent | 2f133b99be5074451d91ba0ff856c3c24f2e84bc (diff) | |
| parent | 834bb1a1102d9bfab4327af6522978b9f6c200f0 (diff) | |
| download | dexon-solidity-afca2acb779746fc3ee12391137a133cbcec8d3b.tar.gz dexon-solidity-afca2acb779746fc3ee12391137a133cbcec8d3b.tar.zst dexon-solidity-afca2acb779746fc3ee12391137a133cbcec8d3b.zip | |
Merge pull request #1012 from ethereum/reserved-keywords
Reserve view and pure as keywords
| -rw-r--r-- | Changelog.md | 2 | ||||
| -rw-r--r-- | libsolidity/parsing/Token.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Changelog.md b/Changelog.md index e0967243..3eba60b3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -28,7 +28,7 @@ Breaking Changes: * Moved (and reworked) standard library contracts from inside the compiler to github.com/ethereum/solidity/std (``import "std";`` or ``import owned;`` do not work anymore). * Confusing and undocumented keyword "after" was removed. - * New reserved words: hex, payable, abstract, static, interface + * New reserved words: abstract, hex, interface, payable, pure, static, view Features: diff --git a/libsolidity/parsing/Token.h b/libsolidity/parsing/Token.h index cc85b610..2bf7419e 100644 --- a/libsolidity/parsing/Token.h +++ b/libsolidity/parsing/Token.h @@ -230,12 +230,14 @@ namespace solidity K(Let, "let", 0) \ K(Match, "match", 0) \ K(Of, "of", 0) \ + K(Pure, "pure", 0) \ K(Relocatable, "relocatable", 0) \ K(Static, "static", 0) \ K(Switch, "switch", 0) \ 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) \ \ |