Remove non-0.5.0 warning for emit keyword (make it mandatory)

axic · chriseth · commit 80b7d361873f · 2018-06-26T20:00:54.000+02:00
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
@@ -1712,12 +1712,7 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
 			m_errorReporter.typeError(_functionCall.location(), "\"suicide\" has been deprecated in favour of \"selfdestruct\"");
 	}
 	if (!m_insideEmitStatement && functionType->kind() == FunctionType::Kind::Event)
-	{
-		if (m_scope->sourceUnit().annotation().experimentalFeatures.count(ExperimentalFeature::V050))
-			m_errorReporter.typeError(_functionCall.location(), "Event invocations have to be prefixed by \"emit\".");
-		else
-			m_errorReporter.warning(_functionCall.location(), "Invoking events without \"emit\" prefix is deprecated.");
-	}
+		m_errorReporter.typeError(_functionCall.location(), "Event invocations have to be prefixed by \"emit\".");
 
 	TypePointers parameterTypes = functionType->parameterTypes();
 
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/080_event.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/080_event.sol
@@ -1,6 +1,5 @@
 contract c {
     event e(uint indexed a, bytes3 indexed s, bool indexed b);
-    function f() public { e(2, "abc", true); }
+    function f() public { emit e(2, "abc", true); }
 }
 // ----
-// Warning: (102-119): Invoking events without "emit" prefix is deprecated.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/090_event_call.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/090_event_call.sol
@@ -1,6 +1,5 @@
 contract c {
     event e(uint a, bytes3 indexed s, bool indexed b);
-    function f() public { e(2, "abc", true); }
+    function f() public { emit e(2, "abc", true); }
 }
 // ----
-// Warning: (94-111): Invoking events without "emit" prefix is deprecated.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/094_event_inheritance.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/094_event_inheritance.sol
@@ -2,7 +2,6 @@ contract base {
     event e(uint a, bytes3 indexed s, bool indexed b);
 }
 contract c is base {
-    function f() public { e(2, "abc", true); }
+    function f() public { emit e(2, "abc", true); }
 }
 // ----
-// Warning: (120-137): Invoking events without "emit" prefix is deprecated.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/563_event_without_emit_deprecated.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/563_event_without_emit_deprecated.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// Warning: (62-65): Invoking events without "emit" prefix is deprecated.
+// TypeError: (62-65): Event invocations have to be prefixed by "emit".
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_event.sol b/test/libsolidity/syntaxTests/types/empty_tuple_event.sol
@@ -2,9 +2,9 @@ pragma solidity ^0.4.3;
 contract C {
     event SomeEvent();
     function a() public {
-        (SomeEvent(), 7);
+        (emit SomeEvent(), 7);
     }
 }
 // ----
-// Warning: (95-106): Invoking events without "emit" prefix is deprecated.
+// TypeError: (95-106): Event invocations have to be prefixed by "emit".
 // Warning: (95-106): Tuple component cannot be empty.
diff --git a/test/libsolidity/syntaxTests/types/empty_tuple_event_050.sol b/test/libsolidity/syntaxTests/types/empty_tuple_event_050.sol

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`contract c {`
`2`	`2`	`event e(uint indexed a, bytes3 indexed s, bool indexed b);`
`3`		`- function f() public { e(2, "abc", true); }`
	`3`	`+ function f() public { emit e(2, "abc", true); }`
`4`	`4`	`}`
`5`	`5`	`// ----`
`6`		`-// Warning: (102-119): Invoking events without "emit" prefix is deprecated.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`contract c {`
`2`	`2`	`event e(uint a, bytes3 indexed s, bool indexed b);`
`3`		`- function f() public { e(2, "abc", true); }`
	`3`	`+ function f() public { emit e(2, "abc", true); }`
`4`	`4`	`}`
`5`	`5`	`// ----`
`6`		`-// Warning: (94-111): Invoking events without "emit" prefix is deprecated.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ contract base {`
`2`	`2`	`event e(uint a, bytes3 indexed s, bool indexed b);`
`3`	`3`	`}`
`4`	`4`	`contract c is base {`
`5`		`- function f() public { e(2, "abc", true); }`
	`5`	`+ function f() public { emit e(2, "abc", true); }`
`6`	`6`	`}`
`7`	`7`	`// ----`
`8`		`-// Warning: (120-137): Invoking events without "emit" prefix is deprecated.`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@ contract C {`
`5`	`5`	`}`
`6`	`6`	`}`
`7`	`7`	`// ----`
`8`		`-// Warning: (62-65): Invoking events without "emit" prefix is deprecated.`
	`8`	`+// TypeError: (62-65): Event invocations have to be prefixed by "emit".`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,9 @@ pragma solidity ^0.4.3;`
`2`	`2`	`contract C {`
`3`	`3`	`event SomeEvent();`
`4`	`4`	`function a() public {`
`5`		`- (SomeEvent(), 7);`
	`5`	`+ (emit SomeEvent(), 7);`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`// ----`
`9`		`-// Warning: (95-106): Invoking events without "emit" prefix is deprecated.`
	`9`	`+// TypeError: (95-106): Event invocations have to be prefixed by "emit".`
`10`	`10`	`// Warning: (95-106): Tuple component cannot be empty.`