diff options
| author | winsvega <winsvega@mail.ru> | 2015-02-19 21:55:03 +0800 |
|---|---|---|
| committer | winsvega <winsvega@mail.ru> | 2015-02-19 21:55:03 +0800 |
| commit | e832fec8d5a82fe8e6dc0428f78a4ad755e6aa08 (patch) | |
| tree | 378879e1a4f9ad45cf8ac677f0736c4ef072d515 /SolidityNameAndTypeResolution.cpp | |
| parent | 2f73e8e6bc1f586a0b40dc873ee6b5237f7e0b15 (diff) | |
| parent | 98739c362a9ca0d1410518d667956a406d63afa8 (diff) | |
| download | dexon-solidity-e832fec8d5a82fe8e6dc0428f78a4ad755e6aa08.tar dexon-solidity-e832fec8d5a82fe8e6dc0428f78a4ad755e6aa08.tar.gz dexon-solidity-e832fec8d5a82fe8e6dc0428f78a4ad755e6aa08.tar.bz2 dexon-solidity-e832fec8d5a82fe8e6dc0428f78a4ad755e6aa08.tar.lz dexon-solidity-e832fec8d5a82fe8e6dc0428f78a4ad755e6aa08.tar.xz dexon-solidity-e832fec8d5a82fe8e6dc0428f78a4ad755e6aa08.tar.zst dexon-solidity-e832fec8d5a82fe8e6dc0428f78a4ad755e6aa08.zip | |
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop
Diffstat (limited to 'SolidityNameAndTypeResolution.cpp')
| -rw-r--r-- | SolidityNameAndTypeResolution.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/SolidityNameAndTypeResolution.cpp b/SolidityNameAndTypeResolution.cpp index 6b337ac7..bfef873c 100644 --- a/SolidityNameAndTypeResolution.cpp +++ b/SolidityNameAndTypeResolution.cpp @@ -470,7 +470,7 @@ BOOST_AUTO_TEST_CASE(illegal_override_indirect) BOOST_AUTO_TEST_CASE(illegal_override_visibility) { char const* text = R"( - contract B { function f() protected {} } + contract B { function f() inheritable {} } contract C is B { function f() public {} } )"; BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError); @@ -706,7 +706,7 @@ BOOST_AUTO_TEST_CASE(private_state_variable) " uint64(2);\n" " }\n" "uint256 private foo;\n" - "uint256 protected bar;\n" + "uint256 inheritable bar;\n" "}\n"; ASTPointer<SourceUnit> source; @@ -717,7 +717,7 @@ BOOST_AUTO_TEST_CASE(private_state_variable) function = retrieveFunctionBySignature(contract, "foo()"); BOOST_CHECK_MESSAGE(function == nullptr, "Accessor function of a private variable should not exist"); function = retrieveFunctionBySignature(contract, "bar()"); - BOOST_CHECK_MESSAGE(function == nullptr, "Accessor function of a protected variable should not exist"); + BOOST_CHECK_MESSAGE(function == nullptr, "Accessor function of an inheritable variable should not exist"); } BOOST_AUTO_TEST_CASE(fallback_function) @@ -832,11 +832,11 @@ BOOST_AUTO_TEST_CASE(access_to_default_function_visibility) BOOST_CHECK_NO_THROW(parseTextAndResolveNames(text)); } -BOOST_AUTO_TEST_CASE(access_to_protected_function) +BOOST_AUTO_TEST_CASE(access_to_inheritable_function) { char const* text = R"( contract c { - function f() protected {} + function f() inheritable {} } contract d { function g() { c(0).f(); } @@ -856,7 +856,7 @@ BOOST_AUTO_TEST_CASE(access_to_default_state_variable_visibility) BOOST_CHECK_THROW(parseTextAndResolveNames(text), TypeError); } -BOOST_AUTO_TEST_CASE(access_to_protected_state_variable) +BOOST_AUTO_TEST_CASE(access_to_inheritable_state_variable) { char const* text = R"( contract c { |