diff options
| author | Yoichi Hirai <i@yoichihirai.com> | 2017-03-14 22:22:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 22:22:01 +0800 |
| commit | 409eb9e3e494ad5a45c14eb7f550ad8fad2b5573 (patch) | |
| tree | ea29137b7c499b0ddbef1e62bb8a4d401c694224 /libsolidity/analysis | |
| parent | 9aab3b8639afa6e30e866e052a412b6f39c6ef6c (diff) | |
| parent | 47cd8964b8617e5c7e93232719224c8334a4c764 (diff) | |
| download | dexon-solidity-409eb9e3e494ad5a45c14eb7f550ad8fad2b5573.tar dexon-solidity-409eb9e3e494ad5a45c14eb7f550ad8fad2b5573.tar.gz dexon-solidity-409eb9e3e494ad5a45c14eb7f550ad8fad2b5573.tar.bz2 dexon-solidity-409eb9e3e494ad5a45c14eb7f550ad8fad2b5573.tar.lz dexon-solidity-409eb9e3e494ad5a45c14eb7f550ad8fad2b5573.tar.xz dexon-solidity-409eb9e3e494ad5a45c14eb7f550ad8fad2b5573.tar.zst dexon-solidity-409eb9e3e494ad5a45c14eb7f550ad8fad2b5573.zip | |
Merge pull request #1765 from ethereum/requireAssert
Require and Assert.
Diffstat (limited to 'libsolidity/analysis')
| -rw-r--r-- | libsolidity/analysis/GlobalContext.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libsolidity/analysis/GlobalContext.cpp b/libsolidity/analysis/GlobalContext.cpp index 069d10f5..d8f1603a 100644 --- a/libsolidity/analysis/GlobalContext.cpp +++ b/libsolidity/analysis/GlobalContext.cpp @@ -66,9 +66,10 @@ m_magicVariables(vector<shared_ptr<MagicVariableDeclaration const>>{make_shared< make_shared<FunctionType>(strings{"bytes32", "uint8", "bytes32", "bytes32"}, strings{"address"}, FunctionType::Location::ECRecover)), make_shared<MagicVariableDeclaration>("ripemd160", make_shared<FunctionType>(strings(), strings{"bytes20"}, FunctionType::Location::RIPEMD160, true)), -// Disabled until decision about semantics of assert is made. -// make_shared<MagicVariableDeclaration>("assert", -// make_shared<FunctionType>(strings{"bool"}, strings{}, FunctionType::Location::Assert)), + make_shared<MagicVariableDeclaration>("assert", + make_shared<FunctionType>(strings{"bool"}, strings{}, FunctionType::Location::Assert)), + make_shared<MagicVariableDeclaration>("require", + make_shared<FunctionType>(strings{"bool"}, strings{}, FunctionType::Location::Require)), make_shared<MagicVariableDeclaration>("revert", make_shared<FunctionType>(strings(), strings(), FunctionType::Location::Revert))}) { |