aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changelog.md3
-rw-r--r--libsolidity/analysis/TypeChecker.cpp3
-rw-r--r--test/libsolidity/SolidityNameAndTypeResolution.cpp10
3 files changed, 15 insertions, 1 deletions
diff --git a/Changelog.md b/Changelog.md
index a587d3ad..49d92eb5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,9 +10,10 @@ Features:
* Type Checker: Warn about shifting a literal.
Bugfixes:
+ * Assembly Parser: Be more strict about number literals.
* Parser: Enforce commas between array and tuple elements.
* Parser: Limit maximum recursion depth.
- * Assembly Parser: Be more strict about number literals.
+ * Type Checker: Disallow constructors in libraries.
### 0.4.15 (2017-08-08)
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 0764bf67..e5660cde 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -546,6 +546,9 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
if (_function.isConstructor())
m_errorReporter.typeError(_function.location(), "Constructor cannot be defined in interfaces.");
}
+ else if (m_scope->contractKind() == ContractDefinition::ContractKind::Library)
+ if (_function.isConstructor())
+ m_errorReporter.typeError(_function.location(), "Constructor cannot be defined in libraries.");
if (_function.isImplemented())
_function.body().accept(*this);
else if (_function.isConstructor())
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index fb2686fc..fad1ca61 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -3055,6 +3055,16 @@ BOOST_AUTO_TEST_CASE(library_having_variables)
CHECK_ERROR(text, TypeError, "Library cannot have non-constant state variables");
}
+BOOST_AUTO_TEST_CASE(library_constructor)
+{
+ char const* text = R"(
+ library Lib {
+ function Lib();
+ }
+ )";
+ CHECK_ERROR_ALLOW_MULTI(text, TypeError, "Constructor cannot be defined in libraries.");
+}
+
BOOST_AUTO_TEST_CASE(valid_library)
{
char const* text = R"(