Binding rules for emit statements and basic event definitions

crates/solidity/inputs/language/bindings/rules.msgb

@@ -686,6 +686,12 @@ attribute symbol_reference = symbol => type = "push_symbol", symbol = symbol, i
  }
 }
 
+;; Emit statements
+
+@stmt [Statement [EmitStatement @event_ident [IdentifierPath]]] {
+ edge @event_ident.left -> @stmt.lexical_scope
+}
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; State Variables
@@ -847,6 +853,41 @@ attribute symbol_reference = symbol => type = "push_symbol", symbol = symbol, i
 }
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;; Event definitions
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+@event [EventDefinition @name name: [Identifier]] {
+ node def
+ attr (def) node_definition = @name
+ attr (def) definiens_node = @event
+
+ edge @event.def -> def
+}
+
+;; Make the enum available to the enclosing contract/interface/library.
+;; NB. top-level enums (ie. those defined at the file's level) are already
+;; covered above
+
+@contract [ContractDefinition members: [ContractMembers
+ item: [ContractMember @event variant: [EventDefinition]]
+]] {
+ edge @contract.type_members -> @event.def
+}
+
+@interface [InterfaceDefinition members: [InterfaceMembers
+ item: [ContractMember @event variant: [EventDefinition]]
+]] {
+ edge @interface.type_members -> @event.def
+}
+
+@library [LibraryDefinition members: [LibraryMembers
+ item: [ContractMember @event variant: [EventDefinition]]
+]] {
+ edge @library.members -> @event.def
+}
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Expressions
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -982,6 +1023,7 @@ attribute symbol_reference = symbol => type = "push_symbol", symbol = symbol, i
  attr (ref) node_reference = @name
  ;; TODO: bind the named argument to the parameters definition of the function
  ;; (is this possible given that function references are expressions?)
+ ;; Ditto for events emissions (where it should be possible for sure)
 }
 
 @args [ArgumentsDeclaration [NamedArgumentsDeclaration
@@ -994,6 +1036,11 @@ attribute symbol_reference = symbol => type = "push_symbol", symbol = symbol, i
  edge @args.lexical_scope -> @funcall.lexical_scope
 }
 
+;; Arguments to an event in an emit statement
+@stmt [Statement [EmitStatement @args [ArgumentsDeclaration]]] {
+ edge @args.lexical_scope -> @stmt.lexical_scope
+}
+
 
 ;;; Type expressions
 

crates/solidity/outputs/cargo/tests/src/bindings_assertions/assertions.rs

@@ -368,8 +368,6 @@ fn check_reference_assertion(
  version: &Version,
  assertion: &ReferenceAssertion<'_>,
 ) -> Result<(), String> {
- let resolution = find_and_resolve_reference(bindings, assertion)?;
-
  let ReferenceAssertion {
  id, version_req, ..
  } = assertion;
@@ -380,6 +378,18 @@ fn check_reference_assertion(
  true
  };
 
+ let resolution = match find_and_resolve_reference(bindings, assertion) {
+ Ok(resolution) => resolution,
+ Err(err) => {
+ if version_matches {
+ return Err(err);
+ }
+ // the reference was not found, but that's ok if the assertion
+ // should not match for this version
+ None
+ }
+ };
+
  match (version_matches, id) {
  (true, None) => {
  if let Some(resolved_handle) = resolution {

crates/solidity/testing/snapshots/bindings_assertions/control/emit_event.sol

@@ -0,0 +1,23 @@
+contract Test {
+ event TestEvent(int id);
+ // ^def:1
+
+ function test_emit() public {
+ int x = 1;
+ // ^def:2
+
+ emit TestEvent(x);
+ // ^ref:2 (>= 0.4.21)
+ // ^ref:1 (>= 0.4.21)
+ emit Utils.Debug(x);
+ // ^ref:2 (>= 0.4.21)
+ // ^ref:4 (>= 0.4.21)
+ // ^ref:3 (>= 0.4.21)
+ }
+}
+
+library Utils {
+ // ^def:3
+ event Debug(int subject);
+ // ^def:4
+}

crates/solidity/testing/snapshots/bindings_output/control/emit_event/generated/0.4.11-failure.txt

@@ -0,0 +1,33 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Parse errors:
+Error: Expected Equal or Semicolon.
+ ╭─[input.sol:7:23]
+ │
+ 7 │ emit TestEvent(x);
+ │ ─┬─ 
+ │ ╰─── Error occurred here.
+───╯
+References and definitions: 
+ ╭─[input.sol:1:1]
+ │
+ 1 │ contract Test {
+ │ ──┬─ 
+ │ ╰─── def: 1
+ 2 │ event TestEvent(int id);
+ │ ────┬──── 
+ │ ╰────── def: 2
+ │ 
+ 4 │ function test_emit() public {
+ │ ────┬──── 
+ │ ╰────── def: 3
+ 5 │ int x = 1;
+ │ ┬ 
+ │ ╰── def: 4
+ │ 
+ 7 │ emit TestEvent(x);
+ │ ──┬─ ────┬──── 
+ │ ╰───────────── unresolved
+ │ │ 
+ │ ╰────── def: 5
+───╯

crates/solidity/testing/snapshots/bindings_output/control/emit_event/generated/0.4.21-success.txt

@@ -0,0 +1,25 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+References and definitions: 
+ ╭─[input.sol:1:1]
+ │
+ 1 │ contract Test {
+ │ ──┬─ 
+ │ ╰─── def: 1
+ 2 │ event TestEvent(int id);
+ │ ────┬──── 
+ │ ╰────── def: 2
+ │ 
+ 4 │ function test_emit() public {
+ │ ────┬──── 
+ │ ╰────── def: 3
+ 5 │ int x = 1;
+ │ ┬ 
+ │ ╰── def: 4
+ │ 
+ 7 │ emit TestEvent(x);
+ │ ────┬──── ┬ 
+ │ ╰──────── ref: 2
+ │ │ 
+ │ ╰── ref: 4
+───╯

crates/solidity/testing/snapshots/bindings_output/control/emit_event/input.sol

@@ -0,0 +1,9 @@
+contract Test {
+ event TestEvent(int id);
+
+ function test_emit() public {
+ int x = 1;
+
+ emit TestEvent(x);
+ }
+}