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

fixed problem with var...probably a conversion problem for fixed in size capabilities

Browse Source 
adding fixed type tests

Removing bitshift and regrouping fixed type tests together
This commit is contained in:
RJ Catalano 2016-03-11 17:53:54 -06:00 committed by VoR0220
parent dff1a26f55
commit 91fda50922
3 changed files with 73 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsolidity/parsing/Token.cpp
View File

@ -153,9 +153,9 @@ tuple<Token::Value, unsigned int, unsigned int> Token::fromIdentifierOrKeyword(s
positionM < positionX && positionM < positionX &&
positionX < _literal.end() && positionX < _literal.end() &&
*positionX == 'x' && *positionX == 'x' &&
all_of(positionX++, _literal.end(), ::isdigit) all_of(++positionX, _literal.end(), ::isdigit)
) { ) {
int n = parseSize(positionX + 1, _literal.end()); int n = parseSize(positionX, _literal.end());
if ( if (
0 <= m && m <= 256 && 0 <= m && m <= 256 &&
0 <= n && n <= 256 && 0 <= n && n <= 256 &&

70
test/libsolidity/SolidityNameAndTypeResolution.cpp
View File

@ -3222,7 +3222,6 @@ BOOST_AUTO_TEST_CASE(library_functions_do_not_have_value)
BOOST_CHECK(!success(text)); BOOST_CHECK(!success(text));
} }
BOOST_AUTO_TEST_CASE(invalid_fixed_types_0x7_mxn) BOOST_AUTO_TEST_CASE(invalid_fixed_types_0x7_mxn)
{ {
char const* text = R"( char const* text = R"(
@ -3544,9 +3543,41 @@ BOOST_AUTO_TEST_CASE(rational_bitand_binary_operation)
} }
} }
)"; )";
BOOST_CHECK(success(text));
}
BOOST_AUTO_TEST_CASE(invalid_non_mod_8_fixed_types)
{
char const* text = R"(
contract test {
function f(){
fixed8x10 a = 12345678.1234567890;
}
}
)";
BOOST_CHECK(!success(text)); BOOST_CHECK(!success(text));
} }
BOOST_AUTO_TEST_CASE(valid_fixed_types)
{
char const* text = R"(
contract test {
function f(){
fixed8x8 a = 87654321.12345678;
fixed16x16 b = a**2;
fixed24x24 c = b**(1.5);
fixed32x32 d = b**2;
fixed40x40 e = a**5;
}
}
)";
BOOST_CHECK(success(text));
}
BOOST_AUTO_TEST_CASE(fixed_type_int_conversion) BOOST_AUTO_TEST_CASE(fixed_type_int_conversion)
{ {
char const* text = R"( char const* text = R"(
@ -3620,6 +3651,19 @@ BOOST_AUTO_TEST_CASE(fixed_type_literal_seconds_and_wei)
BOOST_CHECK(!success(text)); BOOST_CHECK(!success(text));
} }
BOOST_AUTO_TEST_CASE(uint_array_declaration_with_fixed_type)
{
char const* text = R"(
contract test {
function f() {
uint[fixed(3.56)] a;
}
}
)";
BOOST_CHECK(!success(text));
}
BOOST_AUTO_TEST_CASE(array_declaration_with_fixed_literal) BOOST_AUTO_TEST_CASE(array_declaration_with_fixed_literal)
{ {
char const* text = R"( char const* text = R"(
@ -3645,6 +3689,18 @@ BOOST_AUTO_TEST_CASE(mapping_with_fixed_literal)
BOOST_CHECK(success(text)); BOOST_CHECK(success(text));
} }
BOOST_AUTO_TEST_CASE(inline_array_fixed_type)
{
char const* text = R"(
contract test {
function f() {
fixed[3] memory a = [fixed(3.5), fixed(4.1234), fixed(967.32)];
}
}
)";
BOOST_CHECK(success(text));
}
BOOST_AUTO_TEST_CASE(inline_array_fixed_literals) BOOST_AUTO_TEST_CASE(inline_array_fixed_literals)
{ {
char const* text = R"( char const* text = R"(
@ -3657,6 +3713,17 @@ BOOST_AUTO_TEST_CASE(inline_array_fixed_literals)
BOOST_CHECK(success(text)); BOOST_CHECK(success(text));
} }
BOOST_AUTO_TEST_CASE(zero_and_eight_variants_fixed)
{
char const* text = R"(
contract A {
fixed8x0 someInt = 4;
fixed0x8 half = 0.5;
}
)";
BOOST_CHECK(success(text));
}
BOOST_AUTO_TEST_CASE(size_capabilities_of_fixed_point_types) BOOST_AUTO_TEST_CASE(size_capabilities_of_fixed_point_types)
{ {
char const* text = R"( char const* text = R"(
@ -3685,6 +3752,7 @@ BOOST_AUTO_TEST_CASE(var_capable_of_holding_fixed_constants)
BOOST_CHECK(success(text)); BOOST_CHECK(success(text));
} }
BOOST_AUTO_TEST_SUITE_END() BOOST_AUTO_TEST_SUITE_END()
} }