aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libdevcore/JSON.h4
-rw-r--r--libsolidity/ast/ASTJsonConverter.cpp4
-rw-r--r--solc/CommandLineInterface.cpp1
-rw-r--r--test/liblll/EndToEndTest.cpp229
4 files changed, 233 insertions, 5 deletions
diff --git a/libdevcore/JSON.h b/libdevcore/JSON.h
index 0d6e0d2e..9f7d9a03 100644
--- a/libdevcore/JSON.h
+++ b/libdevcore/JSON.h
@@ -27,13 +27,13 @@
namespace dev
{
-/// Serialise the JSON object (@a _input) with identation
+/// Serialise the JSON object (@a _input) with indentation
inline std::string jsonPrettyPrint(Json::Value const& _input)
{
return Json::StyledWriter().write(_input);
}
-/// Serialise theJ SON object (@a _input) without identation
+/// Serialise the JSON object (@a _input) without indentation
inline std::string jsonCompactPrint(Json::Value const& _input)
{
Json::FastWriter writer;
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
index f6b06be6..493707b9 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -318,7 +318,7 @@ bool ASTJsonConverter::visit(Throw const& _node)
bool ASTJsonConverter::visit(VariableDeclarationStatement const& _node)
{
- addJsonNode(_node, "VariableDefinitionStatement", {}, true);
+ addJsonNode(_node, "VariableDeclarationStatement", {}, true);
return true;
}
@@ -407,7 +407,7 @@ bool ASTJsonConverter::visit(Identifier const& _node)
bool ASTJsonConverter::visit(ElementaryTypeNameExpression const& _node)
{
- addJsonNode(_node, "ElementaryTypenameExpression", {
+ addJsonNode(_node, "ElementaryTypeNameExpression", {
make_pair("value", _node.typeName().toString()),
make_pair("type", type(_node))
});
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 6e59099a..c83432ca 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -325,7 +325,6 @@ void CommandLineInterface::handleFormal()
void CommandLineInterface::readInputFilesAndConfigureRemappings()
{
- vector<string> inputFiles;
bool addStdin = false;
if (!m_args.count("input-file"))
addStdin = true;
diff --git a/test/liblll/EndToEndTest.cpp b/test/liblll/EndToEndTest.cpp
index b5e32e94..77c1f740 100644
--- a/test/liblll/EndToEndTest.cpp
+++ b/test/liblll/EndToEndTest.cpp
@@ -43,6 +43,235 @@ BOOST_AUTO_TEST_CASE(smoke_test)
BOOST_CHECK(callFallback() == encodeArgs(string("test", 4)));
}
+BOOST_AUTO_TEST_CASE(bare_panic)
+{
+ char const* sourceCode = "(panic)";
+ compileAndRunWithoutCheck(sourceCode);
+ BOOST_REQUIRE(m_output.empty());
+}
+
+BOOST_AUTO_TEST_CASE(exp_operator_const)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (return (exp 2 3)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == toBigEndian(u256(8)));
+}
+
+BOOST_AUTO_TEST_CASE(exp_operator_const_signed)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (return (exp (- 0 2) 3)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == toBigEndian(u256(-8)));
+}
+
+BOOST_AUTO_TEST_CASE(exp_operator_on_range)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (when (= (div (calldataload 0x00) (exp 2 224)) 0xb3de648b)
+ (return (exp 2 (calldataload 0x04))))
+ (jump 0x02)))
+ )";
+ compileAndRun(sourceCode);
+ testContractAgainstCppOnRange("f(uint256)", [](u256 const& a) -> u256 { return u256(1 << a.convert_to<int>()); }, 0, 16);
+}
+
+BOOST_AUTO_TEST_CASE(constructor_argument_internal_numeric)
+{
+ char const* sourceCode = R"(
+ (seq
+ (sstore 0x00 65535)
+ (returnlll
+ (return @@0x00)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(u256(65535)));
+}
+
+BOOST_AUTO_TEST_CASE(constructor_argument_internal_string)
+{
+ char const* sourceCode = R"(
+ (seq
+ (sstore 0x00 "test")
+ (returnlll
+ (return @@0x00)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs("test"));
+}
+
+BOOST_AUTO_TEST_CASE(constructor_arguments_external)
+{
+ char const* sourceCode = R"(
+ (seq
+ (codecopy 0x00 (bytecodesize) 64)
+ (sstore 0x00 @0x00)
+ (sstore 0x01 @0x20)
+ (returnlll
+ (seq
+ (when (= (div (calldataload 0x00) (exp 2 224)) 0xf2c9ecd8)
+ (return @@0x00))
+ (when (= (div (calldataload 0x00) (exp 2 224)) 0x89ea642f)
+ (return @@0x01)))))
+ )";
+ compileAndRun(sourceCode, 0, "", encodeArgs(u256(65535), "test"));
+ BOOST_CHECK(callContractFunction("getNumber()") == encodeArgs(u256(65535)));
+ BOOST_CHECK(callContractFunction("getString()") == encodeArgs("test"));
+}
+
+BOOST_AUTO_TEST_CASE(fallback_and_invalid_function)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (when (= (div (calldataload 0x00) (exp 2 224)) 0xab5ed150)
+ (return "one"))
+ (when (= (div (calldataload 0x00) (exp 2 224)) 0xee784123)
+ (return "two"))
+ (return "three")))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callContractFunction("getOne()") == encodeArgs("one"));
+ BOOST_CHECK(callContractFunction("getTwo()") == encodeArgs("two"));
+ BOOST_CHECK(callContractFunction("invalidFunction()") == encodeArgs("three"));
+ BOOST_CHECK(callFallback() == encodeArgs("three"));
+}
+
+BOOST_AUTO_TEST_CASE(lit_string)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (lit 0x00 "abcdef")
+ (return 0x00 0x20)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(string("abcdef")));
+}
+
+BOOST_AUTO_TEST_CASE(arithmetic)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (mstore8 0x00 (+ 160 22))
+ (mstore8 0x01 (- 223 41))
+ (mstore8 0x02 (* 33 2))
+ (mstore8 0x03 (/ 10 2))
+ (mstore8 0x04 (% 67 2))
+ (mstore8 0x05 (& 15 8))
+ (mstore8 0x06 (| 18 8))
+ (mstore8 0x07 (^ 26 6))
+ (return 0x00 0x20)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(
+ fromHex("b6b6420501081a1c000000000000000000000000000000000000000000000000")));
+}
+
+BOOST_AUTO_TEST_CASE(binary)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (mstore8 0x00 (< 53 87))
+ (mstore8 0x01 (< 73 42))
+ (mstore8 0x02 (<= 37 94))
+ (mstore8 0x03 (<= 37 37))
+ (mstore8 0x04 (<= 183 34))
+ (mstore8 0x05 (S< (- 0 53) 87))
+ (mstore8 0x06 (S< 73 (- 0 42)))
+ (mstore8 0x07 (S<= (- 0 37) 94))
+ (mstore8 0x08 (S<= (- 0 37) (- 0 37)))
+ (mstore8 0x09 (S<= 183 (- 0 34)))
+ (mstore8 0x0a (> 73 42))
+ (mstore8 0x0b (> 53 87))
+ (mstore8 0x0c (>= 94 37))
+ (mstore8 0x0d (>= 94 94))
+ (mstore8 0x0e (>= 34 183))
+ (mstore8 0x0f (S> 73 (- 0 42)))
+ (mstore8 0x10 (S> (- 0 53) 87))
+ (mstore8 0x11 (S>= 94 (- 0 37)))
+ (mstore8 0x12 (S>= (- 0 94) (- 0 94)))
+ (mstore8 0x13 (S>= (- 0 34) 183))
+ (mstore8 0x14 (= 53 53))
+ (mstore8 0x15 (= 73 42))
+ (mstore8 0x16 (!= 37 94))
+ (mstore8 0x17 (!= 37 37))
+ (return 0x00 0x20)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(
+ fromHex("0100010100010001010001000101000100010100010001000000000000000000")));
+}
+
+BOOST_AUTO_TEST_CASE(unary)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (mstore8 0x00 (! (< 53 87)))
+ (mstore8 0x01 (! (>= 42 73)))
+ (mstore8 0x02 (~ 0x7f))
+ (mstore8 0x03 (~ 0xaa))
+ (return 0x00 0x20)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(
+ fromHex("0001805500000000000000000000000000000000000000000000000000000000")));
+}
+
+BOOST_AUTO_TEST_CASE(assembly_mload_mstore)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (asm
+ 0x07 0x00 mstore
+ "abcdef" 0x20 mstore
+ 0x00 mload 0x40 mstore
+ 0x20 mload 0x60 mstore
+ 0x40 0x40 return))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(u256(7), string("abcdef")));
+}
+
+BOOST_AUTO_TEST_CASE(assembly_sload_sstore)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (asm
+ 0x07 0x00 sstore
+ "abcdef" 0x01 sstore
+ 0x00 sload 0x00 mstore
+ 0x01 sload 0x20 mstore
+ 0x40 0x00 return))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(u256(7), string("abcdef")));
+}
+
+BOOST_AUTO_TEST_CASE(assembly_codecopy)
+{
+ char const* sourceCode = R"(
+ (returnlll
+ (seq
+ (lit 0x00 "abcdef")
+ (asm
+ 0x06 0x16 0x20 codecopy
+ 0x20 0x20 return)))
+ )";
+ compileAndRun(sourceCode);
+ BOOST_CHECK(callFallback() == encodeArgs(string("abcdef")));
+}
+
BOOST_AUTO_TEST_SUITE_END()
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-05 06:50:23 +0800