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 #1012 from ethereum/reserved-keywords

Browse Source 
Reserve view and pure as keywords
This commit is contained in:
chriseth 2016-09-06 13:35:52 +02:00 committed by GitHub
commit afca2acb77
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.md
View File

@ -28,7 +28,7 @@ Breaking Changes:
* Moved (and reworked) standard library contracts from inside the compiler to github.com/ethereum/solidity/std * 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). (``import "std";`` or ``import owned;`` do not work anymore).
* Confusing and undocumented keyword "after" was removed. * 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: Features:

2
libsolidity/parsing/Token.h
View File

@ -230,12 +230,14 @@ namespace solidity
K(Let, "let", 0) \ K(Let, "let", 0) \
K(Match, "match", 0) \ K(Match, "match", 0) \
K(Of, "of", 0) \ K(Of, "of", 0) \
K(Pure, "pure", 0) \
K(Relocatable, "relocatable", 0) \ K(Relocatable, "relocatable", 0) \
K(Static, "static", 0) \ K(Static, "static", 0) \
K(Switch, "switch", 0) \ K(Switch, "switch", 0) \
K(Try, "try", 0) \ K(Try, "try", 0) \
K(Type, "type", 0) \ K(Type, "type", 0) \
K(TypeOf, "typeof", 0) \ K(TypeOf, "typeof", 0) \
K(View, "view", 0) \
/* Illegal token - not able to scan. */ \ /* Illegal token - not able to scan. */ \
T(Illegal, "ILLEGAL", 0) \ T(Illegal, "ILLEGAL", 0) \
\ \