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 #2920 from ethereum/fixConstantBytes

Browse Source 
Allow constant byte arrays.
This commit is contained in:
Alex Beregszaszi 2017-09-19 07:42:32 +01:00 committed by GitHub
commit 1fc71bd758
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -18,6 +18,7 @@ Features:
Bugfixes: Bugfixes:
* ABI JSON: Include all overloaded events. * ABI JSON: Include all overloaded events.
* Parser: Crash fix related to parseTypeName. * Parser: Crash fix related to parseTypeName.
* Type Checker: Allow constant byte arrays.
### 0.4.16 (2017-08-24) ### 0.4.16 (2017-08-24)

2
libsolidity/analysis/TypeChecker.cpp
View File

@ -623,7 +623,7 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
{ {
bool allowed = false; bool allowed = false;
if (auto arrayType = dynamic_cast<ArrayType const*>(_variable.type().get())) if (auto arrayType = dynamic_cast<ArrayType const*>(_variable.type().get()))
allowed = arrayType->isString(); allowed = arrayType->isByteArray();
if (!allowed) if (!allowed)
m_errorReporter.typeError(_variable.location(), "Constants of non-value type not yet implemented."); m_errorReporter.typeError(_variable.location(), "Constants of non-value type not yet implemented.");
} }

24
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -10076,6 +10076,30 @@ BOOST_AUTO_TEST_CASE(function_types_sig)
BOOST_CHECK(callContractFunction("h()") == encodeArgs(asString(FixedHash<4>(dev::keccak256("f()")).asBytes()))); BOOST_CHECK(callContractFunction("h()") == encodeArgs(asString(FixedHash<4>(dev::keccak256("f()")).asBytes())));
} }
BOOST_AUTO_TEST_CASE(constant_string)
{
char const* sourceCode = R"(
contract C {
bytes constant a = "\x03\x01\x02";
bytes constant b = hex"030102";
string constant c = "hello";
function f() returns (bytes) {
return a;
}
function g() returns (bytes) {
return b;
}
function h() returns (bytes) {
return bytes(c);
}
}
)";
compileAndRun(sourceCode, 0, "C");
BOOST_CHECK(callContractFunction("f()") == encodeDyn(string("\x03\x01\x02")));
BOOST_CHECK(callContractFunction("g()") == encodeDyn(string("\x03\x01\x02")));
BOOST_CHECK(callContractFunction("h()") == encodeDyn(string("hello")));
}
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
} }

12
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -2385,6 +2385,18 @@ BOOST_AUTO_TEST_CASE(assignment_to_const_array_vars)
CHECK_ERROR(text, TypeError, "implemented"); CHECK_ERROR(text, TypeError, "implemented");
} }
BOOST_AUTO_TEST_CASE(assignment_to_const_string_bytes)
{
char const* text = R"(
contract C {
bytes constant a = "\x00\x01\x02";
bytes constant b = hex"000102";
string constant c = "hello";
}
)";
CHECK_SUCCESS(text);
}
BOOST_AUTO_TEST_CASE(constant_struct) BOOST_AUTO_TEST_CASE(constant_struct)
{ {
char const* text = R"( char const* text = R"(