cerc-io/solidity
15
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

Test updates.

Browse Source
This commit is contained in:
chriseth 2020-01-22 20:11:33 +01:00
parent 1f51716227
commit 6eec968365
3 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/libyul/Inliner.cpp
View File

@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(simple_inside_structures)
BOOST_CHECK_EQUAL(inlinableFunctions("{" BOOST_CHECK_EQUAL(inlinableFunctions("{"
"function g(a:u256) -> b:u256 { b := a }" "function g(a:u256) -> b:u256 { b := a }"
"for {" "for {"
"} 1:u256 {" "} true {"
"function f() -> x:u256 { x := g(2:u256) }" "function f() -> x:u256 { x := g(2:u256) }"
"}" "}"
"{" "{"

22
test/libyul/Parser.cpp
View File

@ -245,16 +245,6 @@ BOOST_AUTO_TEST_CASE(optional_types)
BOOST_CHECK(successParse("{ function f(a:u256) -> b {} }")); BOOST_CHECK(successParse("{ function f(a:u256) -> b {} }"));
} }
BOOST_AUTO_TEST_CASE(invalid_types)
{
/// testing invalid literal
/// NOTE: these will need to change when types are compared
CHECK_ERROR("{ let x:bool := 1:invalid }", TypeError, "\"invalid\" is not a valid type (user defined types are not yet supported).");
/// testing invalid variable declaration
CHECK_ERROR("{ let x:invalid := 1:bool }", TypeError, "\"invalid\" is not a valid type (user defined types are not yet supported).");
CHECK_ERROR("{ function f(a:invalid) {} }", TypeError, "\"invalid\" is not a valid type (user defined types are not yet supported).");
}
BOOST_AUTO_TEST_CASE(number_literals) BOOST_AUTO_TEST_CASE(number_literals)
{ {
BOOST_CHECK(successParse("{ let x:u256 := 1:u256 }")); BOOST_CHECK(successParse("{ let x:u256 := 1:u256 }"));
@ -268,7 +258,7 @@ BOOST_AUTO_TEST_CASE(builtin_types)
{ {
BOOST_CHECK(successParse("{ let x:bool := true:bool }")); BOOST_CHECK(successParse("{ let x:bool := true:bool }"));
BOOST_CHECK(successParse("{ let x:u8 := 1:u8 }")); BOOST_CHECK(successParse("{ let x:u8 := 1:u8 }"));
BOOST_CHECK(successParse("{ let x:s8 := 1:u8 }")); BOOST_CHECK(successParse("{ let x:s8 := 1:s8 }"));
BOOST_CHECK(successParse("{ let x:u32 := 1:u32 }")); BOOST_CHECK(successParse("{ let x:u32 := 1:u32 }"));
BOOST_CHECK(successParse("{ let x:s32 := 1:s32 }")); BOOST_CHECK(successParse("{ let x:s32 := 1:s32 }"));
BOOST_CHECK(successParse("{ let x:u64 := 1:u64 }")); BOOST_CHECK(successParse("{ let x:u64 := 1:u64 }"));
@ -495,15 +485,7 @@ BOOST_AUTO_TEST_CASE(if_statement_invalid)
{ {
CHECK_ERROR("{ if let x:u256 {} }", ParserError, "Literal or identifier expected."); CHECK_ERROR("{ if let x:u256 {} }", ParserError, "Literal or identifier expected.");
CHECK_ERROR("{ if true:bool let x:u256 := 3:u256 }", ParserError, "Expected '{' but got reserved keyword 'let'"); CHECK_ERROR("{ if true:bool let x:u256 := 3:u256 }", ParserError, "Expected '{' but got reserved keyword 'let'");
// TODO change this to an error once we check types. CHECK_ERROR("{ if 42:u256 { } }", TypeError, "Expected a value of boolean type");
BOOST_CHECK(successParse("{ if 42:u256 { } }"));
}
BOOST_AUTO_TEST_CASE(switch_case_types)
{
CHECK_ERROR("{ switch 0:u256 case 0:u256 {} case 1:u32 {} }", TypeError, "Switch cases have non-matching types.");
// The following should be an error in the future, but this is not yet detected.
BOOST_CHECK(successParse("{ switch 0:u256 case 0:u32 {} case 1:u32 {} }"));
} }
BOOST_AUTO_TEST_CASE(switch_duplicate_case) BOOST_AUTO_TEST_CASE(switch_duplicate_case)

7
test/libyul/yulOptimizerTests/disambiguator/for_statement.yul
View File

@ -1,7 +1,8 @@
{ {
{ let a:u256, b:u256 } { let a:u256, b:u256 }
{ {
for { let a:u256 } a { a := a } { function eq(x: u256, y: u256) -> z: bool {}
for { let a:u256 } eq(a, a) { a := a } {
let b:u256 := a let b:u256 := a
} }
} }
@ -13,7 +14,9 @@
// { // {
// { let a, b } // { let a, b }
// { // {
// for { let a_1 } a_1 { a_1 := a_1 } // function eq(x, y) -> z:bool
// { }
// for { let a_1 } eq(a_1, a_1) { a_1 := a_1 }
// { let b_2 := a_1 } // { let b_2 := a_1 }
// } // }
// } // }