Prevents null type from being used in tuple.

6 files changed, 54 insertions, 0 deletions

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 66b0af58..2675b7eb 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1418,6 +1418,10 @@ bool TypeChecker::visit(TupleExpression const& _tuple)
 				components[i]->accept(*this);
 				types.push_back(type(*components[i]));
 
+				if (types[i]->category() == Type::Category::Tuple)
+					if (dynamic_cast<TupleType const&>(*types[i]).components().empty())
+						m_errorReporter.fatalTypeError(components[i]->location(), "Type of tuple component cannot be null.");
+
 				// Note: code generation will visit each of the expression even if they are not assigned from.
 				if (types[i]->category() == Type::Category::RationalNumber && components.size() > 1)
 					if (!dynamic_cast<RationalNumberType const&>(*types[i]).mobileType())
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_event.sol b/test/libsolidity/syntaxTests/types/empty_tuple_event.sol
new file mode 100644
index 00000000..10b9f345
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/empty_tuple_event.sol
@@ -0,0 +1,10 @@
+pragma solidity ^0.4.3;
+contract C {
+    event SomeEvent();
+    function a() public {
+        (SomeEvent(), 7);
+    }
+}
+// ----
+// Warning: (95-106): Invoking events without "emit" prefix is deprecated.
+// TypeError: (95-106): Type of tuple component cannot be null.
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_event_050.sol b/test/libsolidity/syntaxTests/types/empty_tuple_event_050.sol
new file mode 100644
index 00000000..072234cb
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/empty_tuple_event_050.sol
@@ -0,0 +1,10 @@
+pragma experimental "v0.5.0";
+contract C {
+    event SomeEvent();
+    function a() public {
+        (SomeEvent(), 7);
+    }
+}
+// ----
+// TypeError: (101-112): Event invocations have to be prefixed by "emit".
+// TypeError: (101-112): Type of tuple component cannot be null.
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_function.sol b/test/libsolidity/syntaxTests/types/empty_tuple_function.sol
new file mode 100644
index 00000000..33a55b95
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/empty_tuple_function.sol
@@ -0,0 +1,11 @@
+pragma solidity ^0.4.3;
+contract C {
+    function f() {}
+    function a() public {
+        bool x = true;
+        bool y = true;
+        (x) ? (f(), y = false) : (f(), y = false);
+    }
+}
+// ----
+// TypeError: (144-147): Type of tuple component cannot be null.
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_function_self.sol b/test/libsolidity/syntaxTests/types/empty_tuple_function_self.sol
new file mode 100644
index 00000000..27ab1131
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/empty_tuple_function_self.sol
@@ -0,0 +1,8 @@
+pragma solidity ^0.4.3;
+contract C {
+    function a() public {
+        (a(), 7);
+    }
+}
+// ----
+// TypeError: (72-75): Type of tuple component cannot be null.
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_lvalue.sol b/test/libsolidity/syntaxTests/types/empty_tuple_lvalue.sol
new file mode 100644
index 00000000..e7ae4b29
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/empty_tuple_lvalue.sol
@@ -0,0 +1,11 @@
+pragma solidity ^0.4.3;
+contract C {
+    function f() public pure {}
+    function a() public {
+        uint x;
+        uint y;
+        (x, y) = (f(), f());
+    }
+}
+// ----
+// TypeError: (145-148): Type of tuple component cannot be null.