Merge pull request #4215 from ethereum/constructorWorkaround

Disallow legacy constructor

29 files changed, 13 insertions, 121 deletions

diff --git a/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor_new.sol b/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor.sol
index 8dee4c71..8dee4c71 100644
--- a/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor.sol
diff --git a/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor_old.sol b/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor_old.sol
deleted file mode 100644
index 144743e3..00000000
--- a/test/libsolidity/syntaxTests/constructor/constructible_internal_constructor_old.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function C() internal {}
-}
-contract D is C {
-	function D() public {}
-}
-// ----
-// Warning: (14-38): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// Warning: (60-82): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_new.sol b/test/libsolidity/syntaxTests/constructor/constructor.sol
index aa3422cc..aa3422cc 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor.sol
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_old.sol b/test/libsolidity/syntaxTests/constructor/constructor_old.sol
index 9ec6257d..9ead6858 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_old.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_old.sol
@@ -1,3 +1,4 @@
 contract A { function A() public {} }
 // ----
-// Warning: (13-35): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
+// SyntaxError: (13-35): Functions are not allowed to have the same name as the contract. If you intend this to be a constructor, use "constructor(...) { ... }" to define it.
+// Warning: (13-35): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_old_050.sol b/test/libsolidity/syntaxTests/constructor/constructor_old_050.sol
deleted file mode 100644
index 19e46e79..00000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_old_050.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-pragma experimental "v0.5.0";
-contract A { function A() public {} }
-// ----
-// SyntaxError: (43-65): Functions are not allowed to have the same name as the contract. If you intend this to be a constructor, use "constructor(...) { ... }" to define it.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_state_mutability_new.sol b/test/libsolidity/syntaxTests/constructor/constructor_state_mutability.sol
index 39bf6384..39bf6384 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_state_mutability_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_state_mutability.sol
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_state_mutability_old.sol b/test/libsolidity/syntaxTests/constructor/constructor_state_mutability_old.sol
deleted file mode 100644
index b9f2a4bb..00000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_state_mutability_old.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract test1 {
-    function test1() public view {}
-}
-contract test2 {
-    function test2() public pure {}
-}
-// ----
-// Warning: (21-52): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// Warning: (76-107): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// TypeError: (21-52): Constructor must be payable or non-payable, but is "view".
-// TypeError: (76-107): Constructor must be payable or non-payable, but is "pure".
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_visibility_new.sol b/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol
index f9c4b9b9..f9c4b9b9 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_visibility_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_visibility_old.sol b/test/libsolidity/syntaxTests/constructor/constructor_visibility_old.sol
deleted file mode 100644
index 65f989b0..00000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_visibility_old.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// The constructor of a base class should not be visible in the derived class
-contract A { function A(string memory s) public { } }
-contract B is A {
-  function f() pure public {
-    A x = A(0); // convert from address
-    string memory y = "ab";
-    A(y); // call as a function is invalid
-    x;
-  }
-}
-// ----
-// Warning: (91-129): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// TypeError: (251-255): Explicit type conversion not allowed from "string memory" to "contract A".
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_without_implementation_new.sol b/test/libsolidity/syntaxTests/constructor/constructor_without_implementation.sol
index 6bbb83ce..6bbb83ce 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_without_implementation_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_without_implementation.sol
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_without_implementation_old.sol b/test/libsolidity/syntaxTests/constructor/constructor_without_implementation_old.sol
deleted file mode 100644
index 12bf6315..00000000
--- a/test/libsolidity/syntaxTests/constructor/constructor_without_implementation_old.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-	function C() public;
-}
-// ----
-// Warning: (14-34): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// TypeError: (14-34): Constructor must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/constructor/external_constructor_new.sol b/test/libsolidity/syntaxTests/constructor/external_constructor.sol
index 30cf0668..30cf0668 100644
--- a/test/libsolidity/syntaxTests/constructor/external_constructor_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/external_constructor.sol
diff --git a/test/libsolidity/syntaxTests/constructor/external_constructor_old.sol b/test/libsolidity/syntaxTests/constructor/external_constructor_old.sol
deleted file mode 100644
index 27869361..00000000
--- a/test/libsolidity/syntaxTests/constructor/external_constructor_old.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-	function test() external {}
-}
-// ----
-// Warning: (17-44): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// TypeError: (17-44): Constructor must be public or internal.
diff --git a/test/libsolidity/syntaxTests/constructor/function_named_constructor.sol b/test/libsolidity/syntaxTests/constructor/function_named_constructor.sol
index 29784033..68273c0a 100644
--- a/test/libsolidity/syntaxTests/constructor/function_named_constructor.sol
+++ b/test/libsolidity/syntaxTests/constructor/function_named_constructor.sol
@@ -2,4 +2,4 @@ contract C {
     function constructor() public;
 }
 // ----
-// Warning: (17-47): This function is named "constructor" but is not the constructor of the contract. If you intend this to be a constructor, use "constructor(...) { ... }" without the "function" keyword to define it.
+// ParserError: (26-37): This function is named "constructor" but is not the constructor of the contract. If you intend this to be a constructor, use "constructor(...) { ... }" without the "function" keyword to define it.
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_new.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor.sol
index 2511c751..2511c751 100644
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor.sol
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted_new.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted.sol
index 2a199b3a..2a199b3a 100644
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted.sol
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted_old.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted_old.sol
deleted file mode 100644
index 0a27e9f8..00000000
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_inverted_old.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-// Previously, the type information for A was not yet available at the point of
-// "new A".
-contract B {
-	A a;
-	function B() public {
-		a = new A(this);
-	}
-}
-contract A {
-	function A(address a) internal {}
-}
-// ----
-// Warning: (112-155): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// Warning: (172-205): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// TypeError: (140-145): Contract with internal constructor cannot be created directly.
diff --git a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_old.sol b/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_old.sol
deleted file mode 100644
index 2897e6f3..00000000
--- a/test/libsolidity/syntaxTests/constructor/inconstructible_internal_constructor_old.sol
+++ /dev/null
@@ -1,9 +0,0 @@
-contract C {
-	function C() internal {}
-}
-contract D {
-	function f() public { C x = new C(); x; }
-}
-// ----
-// Warning: (14-38): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// TypeError: (83-88): Contract with internal constructor cannot be created directly.
diff --git a/test/libsolidity/syntaxTests/constructor/interface_constructor_new.sol b/test/libsolidity/syntaxTests/constructor/interface_constructor.sol
index 87585a62..87585a62 100644
--- a/test/libsolidity/syntaxTests/constructor/interface_constructor_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/interface_constructor.sol
diff --git a/test/libsolidity/syntaxTests/constructor/interface_constructor_old.sol b/test/libsolidity/syntaxTests/constructor/interface_constructor_old.sol
deleted file mode 100644
index 2c029f4d..00000000
--- a/test/libsolidity/syntaxTests/constructor/interface_constructor_old.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-interface I {
-	function I() public;
-}
-// ----
-// Warning: (15-35): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// TypeError: (15-35): Functions in interfaces must be declared external.
-// TypeError: (15-35): Constructor cannot be defined in interfaces.
-// TypeError: (15-35): Constructor must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/constructor/library_constructor_new.sol b/test/libsolidity/syntaxTests/constructor/library_constructor.sol
index 38934f8d..38934f8d 100644
--- a/test/libsolidity/syntaxTests/constructor/library_constructor_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/library_constructor.sol
diff --git a/test/libsolidity/syntaxTests/constructor/library_constructor_old.sol b/test/libsolidity/syntaxTests/constructor/library_constructor_old.sol
deleted file mode 100644
index 271cc790..00000000
--- a/test/libsolidity/syntaxTests/constructor/library_constructor_old.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-library Lib {
-	function Lib() public;
-}
-// ----
-// Warning: (15-37): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// TypeError: (15-37): Constructor cannot be defined in libraries.
-// TypeError: (15-37): Constructor must be implemented if declared.
diff --git a/test/libsolidity/syntaxTests/constructor/overriding_constructor.sol b/test/libsolidity/syntaxTests/constructor/overriding_constructor.sol
index 5fb3a189..30cf3bce 100644
--- a/test/libsolidity/syntaxTests/constructor/overriding_constructor.sol
+++ b/test/libsolidity/syntaxTests/constructor/overriding_constructor.sol
@@ -1,10 +1,10 @@
-contract A { constructor() public {} }
-contract B is A { function A() public pure returns (uint8) {} }
-contract C is A { function A() public pure returns (uint8) {} }
-contract D is B { function B() public pure returns (uint8) {} }
-contract E is D { function B() public pure returns (uint8) {} }
+contract A { function f() public {} }
+contract B is A {
+  function A() public pure returns (uint8) {}
+  function g() public {
+    A.f();
+  }
+}
 // ----
-// Warning: (57-100): This declaration shadows an existing declaration.
-// Warning: (121-164): This declaration shadows an existing declaration.
-// Warning: (185-228): This declaration shadows an existing declaration.
-// Warning: (249-292): This declaration shadows an existing declaration.
+// Warning: (58-101): This declaration shadows an existing declaration.
+// TypeError: (130-133): Member "f" not found or not visible after argument-dependent lookup in function () pure returns (uint8).
diff --git a/test/libsolidity/syntaxTests/constructor/returns_in_constructor_new.sol b/test/libsolidity/syntaxTests/constructor/returns_in_constructor.sol
index e6a03014..e6a03014 100644
--- a/test/libsolidity/syntaxTests/constructor/returns_in_constructor_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/returns_in_constructor.sol
diff --git a/test/libsolidity/syntaxTests/constructor/returns_in_constructor_old.sol b/test/libsolidity/syntaxTests/constructor/returns_in_constructor_old.sol
deleted file mode 100644
index 00b3974c..00000000
--- a/test/libsolidity/syntaxTests/constructor/returns_in_constructor_old.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract test {
-	function test() public returns (uint a) { }
-}
-// ----
-// Warning: (17-60): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// TypeError: (48-56): Non-empty "returns" directive for constructor.
diff --git a/test/libsolidity/syntaxTests/constructor/two_constructors_new.sol b/test/libsolidity/syntaxTests/constructor/two_constructors.sol
index 42c0de28..42c0de28 100644
--- a/test/libsolidity/syntaxTests/constructor/two_constructors_new.sol
+++ b/test/libsolidity/syntaxTests/constructor/two_constructors.sol
diff --git a/test/libsolidity/syntaxTests/constructor/two_constructors_mixed.sol b/test/libsolidity/syntaxTests/constructor/two_constructors_mixed.sol
deleted file mode 100644
index c757354e..00000000
--- a/test/libsolidity/syntaxTests/constructor/two_constructors_mixed.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract test {
-	function test(uint) public { }
-	constructor() public {}
-}
-// ----
-// Warning: (17-47): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// DeclarationError: (49-72): More than one constructor defined.
diff --git a/test/libsolidity/syntaxTests/constructor/two_constructors_old.sol b/test/libsolidity/syntaxTests/constructor/two_constructors_old.sol
deleted file mode 100644
index db632ced..00000000
--- a/test/libsolidity/syntaxTests/constructor/two_constructors_old.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract test {
-	function test(uint a) public { }
-	function test() public {}
-}
-// ----
-// Warning: (17-49): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// Warning: (51-76): Defining constructors as functions with the same name as the contract is deprecated. Use "constructor(...) { ... }" instead.
-// DeclarationError: (51-76): More than one constructor defined.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_constructor_local.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_constructor_local.sol
index b89a3bb4..42697b73 100644
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_constructor_local.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/function_type_constructor_local.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// ParserError: (118-119): Expected ';' but got identifier
+// ParserError: (104-115): Expected primary expression.