Reject invalid emit

Fixes ethereum#211
cburgdorf · Mar 24, 2021 · e4f5f65 · e4f5f65
1 parent 895b9b5
commit e4f5f65
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/analyzer/src/traversal/functions.rs b/analyzer/src/traversal/functions.rs
@@ -355,7 +355,7 @@ fn emit(
     } = &stmt.kind
     {
         return match kind {
-            fe::Expr::Call { func, args } => {
+            fe::Expr::Call { func, args } if matches!(&func.kind, fe::Expr::Name(_)) => {
                 let event_name = expressions::expr_name_str(func)?;
 
                 return if let Some(event) = scope.borrow().contract_event_def(event_name) {

diff --git a/compiler/tests/compile_errors.rs b/compiler/tests/compile_errors.rs
@@ -28,6 +28,7 @@ use std::fs;
     case("duplicate_var_in_contract_method.fe", "AlreadyDefined"),
     case("emit_undefined_event.fe", "MissingEventDefinition"),
     case("emit_without_call.fe", "EventInvocationExpected"),
+    case("emit_with_invalid_call.fe", "EventInvocationExpected"),
     case("external_call_type_error.fe", "TypeError"),
     case("external_call_wrong_number_of_params.fe", "WrongNumberOfParams"),
     case("indexed_event.fe", "MoreThanThreeIndexedParams"),

diff --git a/compiler/tests/fixtures/compile_errors/emit_with_invalid_call.fe b/compiler/tests/fixtures/compile_errors/emit_with_invalid_call.fe
@@ -0,0 +1,3 @@
+contract Foo:
+  pub def foo():
+    emit MyEvent("foo", 1000)()
diff --git a/foo.fe b/foo.fe
@@ -0,0 +1,3 @@
+contract Foo:
+    pub def foo():
+        emit MyEvent()()
diff --git a/newsfragments/211.bugfix.md b/newsfragments/211.bugfix.md
@@ -0,0 +1 @@
+Properly reject invalid emit