Bind elementary casting and struct construction to the resulting type

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

@@ -1756,6 +1756,12 @@ inherit .lexical_scope
   attr (param_names) pop_symbol = "@param_names"
   edge def -> param_names
   edge param_names -> @struct.members
+
+  ; Used as a function call, should bind to itself
+  node call
+  attr (call) pop_symbol = "()"
+  edge def -> call
+  edge call -> member
 }
 
 @struct [StructDefinition [StructMembers
@@ -1945,6 +1951,16 @@ inherit .lexical_scope
 @expr [Expression @type [ElementaryType]] {
   edge @expr.output -> @type.ref
   edge @type.ref -> @expr.lexical_scope
+
+  ; Elementary types can also be used for casting; instead of defining built-in
+  ; struct for each available elementary type, we define a special path here
+  node call
+  attr (call) pop_symbol = "()"
+  node typeof
+  attr (typeof) push_symbol = "@typeof"
+  edge @expr.output -> call
+  edge call -> typeof
+  edge typeof -> @type.ref
 }
 
 ;; Index access expressions
@@ -2064,6 +2080,17 @@ inherit .lexical_scope
 }
 
 
+;;; Payable
+; These work like `address`, should they should bind to `%address`
+@expr [Expression [PayableKeyword]] {
+  node ref
+  attr (ref) push_symbol = "%address"
+
+  edge ref -> @expr.lexical_scope
+  edge @expr.output -> ref
+}
+
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; Yul

crates/solidity/inputs/language/src/definition.rs

@@ -6620,11 +6620,6 @@ codegen_language_macros::compile!(Language(
         )
     ],
     built_ins = [
-        BuiltInFunction(
-            name = "$address",
-            parameters = [],
-            return_type = "$address"
-        ),
         BuiltInFunction(
             name = "addmod",
             parameters = ["uint x", "uint y", "uint k"],

crates/solidity/testing/snapshots/bindings_output/expressions/elementary_casting/generated/0.4.11-failure.txt

@@ -0,0 +1,42 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Parse errors:
+Error: Expected AddressKeyword or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or BytesKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DoKeyword or DoubleQuotedHexStringLiteral or DoubleQuotedStringLiteral or FalseKeyword or FixedKeyword or ForKeyword or FunctionKeyword or HexLiteral or Identifier or IfKeyword or IntKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or ReturnKeyword or SingleQuotedHexStringLiteral or SingleQuotedStringLiteral or StringKeyword or ThrowKeyword or TrueKeyword or UfixedKeyword or UintKeyword or VarKeyword or WhileKeyword.
+   ╭─[input.sol:6:9]
+   │
+ 6 │ ╭─▶         payable(a).call("");
+   ┆ ┆   
+ 8 │ ├─▶     }
+   │ │           
+   │ ╰─────────── Error occurred here.
+───╯
+References and definitions: 
+    ╭─[input.sol:1:1]
+    │
+  1 │ contract Test {
+    │          ──┬─  
+    │            ╰─── def: 1
+  2 │     using Lib for uint;
+    │           ─┬─  
+    │            ╰─── ref: 4
+    │ 
+  4 │     function test(address a) public {
+    │              ──┬─         ┬  
+    │                ╰───────────── def: 2
+    │                           │  
+    │                           ╰── def: 3
+  5 │         address(this).balance;
+    │                 ──┬─  ───┬───  
+    │                   ╰──────────── ref: built-in
+    │                          │     
+    │                          ╰───── ref: built-in
+    │ 
+ 11 │ library Lib {
+    │         ─┬─  
+    │          ╰─── def: 4
+ 12 │     function noop(uint x) public returns (uint) {}
+    │              ──┬─      ┬  
+    │                ╰────────── def: 5
+    │                        │  
+    │                        ╰── def: 6
+────╯

crates/solidity/testing/snapshots/bindings_output/expressions/elementary_casting/generated/0.4.21-failure.txt

@@ -0,0 +1,42 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Parse errors:
+Error: Expected AddressKeyword or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or BytesKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DoKeyword or DoubleQuotedHexStringLiteral or DoubleQuotedStringLiteral or EmitKeyword or FalseKeyword or FixedKeyword or ForKeyword or FunctionKeyword or HexLiteral or Identifier or IfKeyword or IntKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or ReturnKeyword or SingleQuotedHexStringLiteral or SingleQuotedStringLiteral or StringKeyword or ThrowKeyword or TrueKeyword or UfixedKeyword or UintKeyword or VarKeyword or WhileKeyword.
+   ╭─[input.sol:6:9]
+   │
+ 6 │ ╭─▶         payable(a).call("");
+   ┆ ┆   
+ 8 │ ├─▶     }
+   │ │           
+   │ ╰─────────── Error occurred here.
+───╯
+References and definitions: 
+    ╭─[input.sol:1:1]
+    │
+  1 │ contract Test {
+    │          ──┬─  
+    │            ╰─── def: 1
+  2 │     using Lib for uint;
+    │           ─┬─  
+    │            ╰─── ref: 4
+    │ 
+  4 │     function test(address a) public {
+    │              ──┬─         ┬  
+    │                ╰───────────── def: 2
+    │                           │  
+    │                           ╰── def: 3
+  5 │         address(this).balance;
+    │                 ──┬─  ───┬───  
+    │                   ╰──────────── ref: built-in
+    │                          │     
+    │                          ╰───── ref: built-in
+    │ 
+ 11 │ library Lib {
+    │         ─┬─  
+    │          ╰─── def: 4
+ 12 │     function noop(uint x) public returns (uint) {}
+    │              ──┬─      ┬  
+    │                ╰────────── def: 5
+    │                        │  
+    │                        ╰── def: 6
+────╯

crates/solidity/testing/snapshots/bindings_output/expressions/elementary_casting/generated/0.5.0-failure.txt

@@ -0,0 +1,42 @@
+# This file is generated automatically by infrastructure scripts. Please don't edit by hand.
+
+Parse errors:
+Error: Expected AddressKeyword or AssemblyKeyword or BoolKeyword or BreakKeyword or ByteKeyword or BytesKeyword or CloseBrace or ContinueKeyword or DecimalLiteral or DoKeyword or DoubleQuotedHexStringLiteral or DoubleQuotedStringLiteral or EmitKeyword or FalseKeyword or FixedKeyword or ForKeyword or FunctionKeyword or HexLiteral or Identifier or IfKeyword or IntKeyword or MappingKeyword or NewKeyword or OpenBrace or OpenBracket or OpenParen or ReturnKeyword or SingleQuotedHexStringLiteral or SingleQuotedStringLiteral or StringKeyword or TrueKeyword or UfixedKeyword or UintKeyword or WhileKeyword.
+   ╭─[input.sol:6:9]
+   │
+ 6 │ ╭─▶         payable(a).call("");
+   ┆ ┆   
+ 8 │ ├─▶     }
+   │ │           
+   │ ╰─────────── Error occurred here.
+───╯
+References and definitions: 
+    ╭─[input.sol:1:1]
+    │
+  1 │ contract Test {
+    │          ──┬─  
+    │            ╰─── def: 1
+  2 │     using Lib for uint;
+    │           ─┬─  
+    │            ╰─── ref: 4
+    │ 
+  4 │     function test(address a) public {
+    │              ──┬─         ┬  
+    │                ╰───────────── def: 2
+    │                           │  
+    │                           ╰── def: 3
+  5 │         address(this).balance;
+    │                 ──┬─  ───┬───  
+    │                   ╰──────────── ref: built-in
+    │                          │     
+    │                          ╰───── ref: built-in
+    │ 
+ 11 │ library Lib {
+    │         ─┬─  
+    │          ╰─── def: 4
+ 12 │     function noop(uint x) public returns (uint) {}
+    │              ──┬─      ┬  
+    │                ╰────────── def: 5
+    │                        │  
+    │                        ╰── def: 6
+────╯