From 42c43394040e68c3bb32ed1e73992e096e5d10d2 Mon Sep 17 00:00:00 2001 From: RJ Catalano Date: Tue, 15 Dec 2015 10:57:57 -0600 Subject: updated attempt, a couple of more things to sort through and change --- test/libsolidity/SolidityParser.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'test') diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp index fd9076c3..d8c1a3e6 100644 --- a/test/libsolidity/SolidityParser.cpp +++ b/test/libsolidity/SolidityParser.cpp @@ -1047,6 +1047,20 @@ BOOST_AUTO_TEST_CASE(using_for) BOOST_CHECK(successParse(text)); } +BOOST_AUTO_TEST_CASE(inline_array_declaration) +{ + char const* text = R"( + contract c { + uint[] a; + function f() returns (uint, uint) { + a = [1,2,3]; + return (a[3], [3,4][0]); + } + } + )"; + BOOST_CHECK(successParse(text)); +} + BOOST_AUTO_TEST_SUITE_END() } -- cgit v1.2.3 From 9ab066de8c157726b9976588b4907496c3489f42 Mon Sep 17 00:00:00 2001 From: RJ Catalano Date: Tue, 15 Dec 2015 14:47:09 -0600 Subject: new tests --- test/libsolidity/SolidityNameAndTypeResolution.cpp | 26 ++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'test') diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index 73a9b660..605771db 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -2743,6 +2743,32 @@ BOOST_AUTO_TEST_CASE(invalid_args_creating_memory_array) BOOST_CHECK(expectError(text) == Error::Type::TypeError); } +BOOST_AUTO_TEST_CASE(inline_array_declaration_and_passing) +{ + char const* text = R"( + contract C { + uint[] a; + function f() returns (uint, uint) { + a = [1,2,3]; + return (a[3], [3,4][0]); + } + } + )"; + BOOST_CHECK(success(text)); +} + +BOOST_AUTO_TEST_CASE(invalid_types_in_inline_array) +{ + char const* text = R"( + contract C { + function f() { + uint[] x = [45, "foo", true]; + } + } + )"; + BOOST_CHECK(expectError(text) == Error::Type::TypeError); +} + BOOST_AUTO_TEST_SUITE_END() } -- cgit v1.2.3 From 0ba24a5289eaaf1941c1e84e774f938353b9b94c Mon Sep 17 00:00:00 2001 From: RJ Catalano Date: Wed, 16 Dec 2015 12:55:52 -0600 Subject: changed a couple of small nuances, made an attempt at fixing the parsing in the inline arrays case (fails), and added test for inline arrays per Chriseth request --- test/libsolidity/SolidityParser.cpp | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'test') diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp index d8c1a3e6..b1af54e0 100644 --- a/test/libsolidity/SolidityParser.cpp +++ b/test/libsolidity/SolidityParser.cpp @@ -1051,16 +1051,30 @@ BOOST_AUTO_TEST_CASE(inline_array_declaration) { char const* text = R"( contract c { - uint[] a; - function f() returns (uint, uint) { - a = [1,2,3]; - return (a[3], [3,4][0]); - } - } + uint[] a; + function f() returns (uint, uint) { + a = [1,2,3]; + return (a[3], [3,4][0]); + } + } )"; BOOST_CHECK(successParse(text)); } +BOOST_AUTO_TEST_CASE(inline_array_empty_cells_check) +{ + char const* text = R"( + contract c { + uint[] a; + function f() returns (uint, uint) { + a = [,2,3]; + return (a[3], [3,4][0]); + } + } + )"; + BOOST_CHECK(!successParse(text)); +} + BOOST_AUTO_TEST_SUITE_END() } -- cgit v1.2.3 From df41812442548a8399f7a7cd0ef6aefcd40740c1 Mon Sep 17 00:00:00 2001 From: RJ Catalano Date: Wed, 16 Dec 2015 13:23:05 -0600 Subject: making this purely about parsing...type checking will go in a different PR --- test/libsolidity/SolidityNameAndTypeResolution.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index 605771db..847f3eaa 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -2743,7 +2743,7 @@ BOOST_AUTO_TEST_CASE(invalid_args_creating_memory_array) BOOST_CHECK(expectError(text) == Error::Type::TypeError); } -BOOST_AUTO_TEST_CASE(inline_array_declaration_and_passing) +/*BOOST_AUTO_TEST_CASE(inline_array_declaration_and_passing) { char const* text = R"( contract C { @@ -2755,7 +2755,7 @@ BOOST_AUTO_TEST_CASE(inline_array_declaration_and_passing) } )"; BOOST_CHECK(success(text)); -} +}*/ BOOST_AUTO_TEST_CASE(invalid_types_in_inline_array) { -- cgit v1.2.3 From f7a1860abd2abe63efcdd9318a54af530e30361c Mon Sep 17 00:00:00 2001 From: RJ Catalano Date: Wed, 16 Dec 2015 13:35:28 -0600 Subject: forgot about this one...again making this purely about parsing...typechecking will come another day --- test/libsolidity/SolidityNameAndTypeResolution.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp index 847f3eaa..1242e801 100644 --- a/test/libsolidity/SolidityNameAndTypeResolution.cpp +++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp @@ -2755,7 +2755,7 @@ BOOST_AUTO_TEST_CASE(invalid_args_creating_memory_array) } )"; BOOST_CHECK(success(text)); -}*/ +} BOOST_AUTO_TEST_CASE(invalid_types_in_inline_array) { @@ -2767,7 +2767,7 @@ BOOST_AUTO_TEST_CASE(invalid_types_in_inline_array) } )"; BOOST_CHECK(expectError(text) == Error::Type::TypeError); -} +}*/ BOOST_AUTO_TEST_SUITE_END() -- cgit v1.2.3 From fe04d7f7f7686ae8fa406880b3c3069e60ee1c20 Mon Sep 17 00:00:00 2001 From: RJ Catalano Date: Wed, 16 Dec 2015 14:50:40 -0600 Subject: added one more test and realized that there was one last change before the parser is perfect --- test/libsolidity/SolidityParser.cpp | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) (limited to 'test') diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp index b1af54e0..c5af075a 100644 --- a/test/libsolidity/SolidityParser.cpp +++ b/test/libsolidity/SolidityParser.cpp @@ -1047,28 +1047,55 @@ BOOST_AUTO_TEST_CASE(using_for) BOOST_CHECK(successParse(text)); } -BOOST_AUTO_TEST_CASE(inline_array_declaration) +BOOST_AUTO_TEST_CASE(inline_array_declaration_lvalue) { char const* text = R"( contract c { uint[] a; - function f() returns (uint, uint) { + function f() returns (uint) { a = [1,2,3]; - return (a[3], [3,4][0]); + return (a[3]); + } + } + )"; + BOOST_CHECK(successParse(text)); +} + +BOOST_AUTO_TEST_CASE(inline_array_declaration_self) +{ + char const* text = R"( + contract c { + uint[] a; + function f() returns (uint) { + return ([1,2,3][0]); } } )"; BOOST_CHECK(successParse(text)); } -BOOST_AUTO_TEST_CASE(inline_array_empty_cells_check) +BOOST_AUTO_TEST_CASE(inline_array_empty_cells_check_beginning) { char const* text = R"( contract c { uint[] a; function f() returns (uint, uint) { a = [,2,3]; - return (a[3], [3,4][0]); + return (a[3], [,3,4][0]); + } + } + )"; + BOOST_CHECK(!successParse(text)); +} + +BOOST_AUTO_TEST_CASE(inline_array_empty_cells_check_commas) +{ + char const* text = R"( + contract c { + uint[] a; + function f() returns (uint, uint) { + a = [1, ,3]; + return (a[3], [3, ,4][0]); } } )"; -- cgit v1.2.3