diff options
| author | Gav Wood <g@ethdev.com> | 2015-02-23 17:42:59 +0800 |
|---|---|---|
| committer | Gav Wood <g@ethdev.com> | 2015-02-23 17:42:59 +0800 |
| commit | f9781f67299f486587738df7ada462b69f86fdd4 (patch) | |
| tree | 50621a8279aca4d5c94696648e961f0bcca60652 | |
| parent | d85bfe1452583ffbbb7fdb406d9561a27788c26b (diff) | |
| parent | c8d4ab1ca0769ecf8ada7cafc7cb0183f94ff49c (diff) | |
| download | dexon-solidity-f9781f67299f486587738df7ada462b69f86fdd4.tar dexon-solidity-f9781f67299f486587738df7ada462b69f86fdd4.tar.gz dexon-solidity-f9781f67299f486587738df7ada462b69f86fdd4.tar.bz2 dexon-solidity-f9781f67299f486587738df7ada462b69f86fdd4.tar.lz dexon-solidity-f9781f67299f486587738df7ada462b69f86fdd4.tar.xz dexon-solidity-f9781f67299f486587738df7ada462b69f86fdd4.tar.zst dexon-solidity-f9781f67299f486587738df7ada462b69f86fdd4.zip | |
Merge pull request #1107 from chriseth/sol_inheritableIsInternal
Replaced "inheritable" by "internal".
| -rw-r--r-- | SolidityNameAndTypeResolution.cpp | 12 | ||||
| -rw-r--r-- | SolidityParser.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/SolidityNameAndTypeResolution.cpp b/SolidityNameAndTypeResolution.cpp index da6c2a88..df970a6e 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() inheritable {} } + contract B { function f() internal {} } 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 inheritable bar;\n" + "uint256 internal 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 an inheritable variable should not exist"); + BOOST_CHECK_MESSAGE(function == nullptr, "Accessor function of an internal 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_inheritable_function) +BOOST_AUTO_TEST_CASE(access_to_internal_function) { char const* text = R"( contract c { - function f() inheritable {} + function f() internal {} } 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_inheritable_state_variable) +BOOST_AUTO_TEST_CASE(access_to_internal_state_variable) { char const* text = R"( contract c { diff --git a/SolidityParser.cpp b/SolidityParser.cpp index ddb58244..69bbc6e0 100644 --- a/SolidityParser.cpp +++ b/SolidityParser.cpp @@ -651,13 +651,13 @@ BOOST_AUTO_TEST_CASE(visibility_specifiers) char const* text = R"( contract c { uint private a; - uint inheritable b; + uint internal b; uint public c; uint d; function f() {} function f_priv() private {} function f_public() public {} - function f_inheritable() inheritable {} + function f_internal() internal {} })"; BOOST_CHECK_NO_THROW(parseText(text)); } @@ -666,7 +666,7 @@ BOOST_AUTO_TEST_CASE(multiple_visibility_specifiers) { char const* text = R"( contract c { - uint private inheritable a; + uint private internal a; })"; BOOST_CHECK_THROW(parseText(text), ParserError); } |