unified/swift: Imports

Author: asgerf

unified/extractor/src/languages/swift/swift.rs

@@ -633,6 +633,38 @@ fn translation_rules() -> Vec<yeast::Rule> {
         rule!((check_expression op: @op target: @val type: @ty) => (type_test_expr expr: {val} operator: (infix_operator #{op}) type: {ty})),
         // Await expression → unary_expr with operator "await"
         rule!((await_expression expr: @val) => (unary_expr operator: (prefix_operator "await") operand: {val})),
+        // A multi-part identifier (for example `Foo.Bar.Baz`) is translated to
+        // a member_access_expr chain with a name_expr base.
+        rule!(
+            (identifier part: _+ @parts)
+            =>
+            {parts}.reduce_left(
+                first -> (name_expr identifier: (identifier #{first})),
+                acc, elem -> (member_access_expr base: {acc} member: (identifier #{elem})))
+        ),
+        // Scoped import declaration (for example `import struct Foo.Bar`):
+        // flatten the identifier parts into a member_access_expr and bind the
+        // final segment as a name_pattern.
+        rule!(
+            (import_declaration scoped_import_kind: @kind name: (identifier part: _+ @parts) @name modifiers: (modifiers)? @mods)
+            =>
+            (import_declaration
+                pattern: (name_pattern identifier: (identifier #{parts.last().unwrap()}))
+                imported_expr: {name}
+                modifier: (modifier #{kind})
+                modifier: {..mods})
+        ),
+        // Non-scoped import declaration (for example `import Foundation`):
+        // flatten the identifier parts into a member_access_expr and use a
+        // bulk_importing_pattern.
+        rule!(
+            (import_declaration name: @name modifiers: (modifiers)? @mods)
+            =>
+            (import_declaration
+                pattern: (bulk_importing_pattern)
+                imported_expr: {name}
+                modifier: {..mods})
+        ),
         // ---- Fallbacks ----
         rule!(
             (_)

unified/extractor/tests/corpus/swift/desugar.txt

@@ -53,3 +53,134 @@ top_level
           right:
             name_expr
               identifier: identifier "bar"
+
+===
+Simple import with single name
+===
+
+import Foundation
+
+---
+
+source_file
+  statement:
+    import_declaration
+      name:
+        identifier
+          part: simple_identifier "Foundation"
+
+---
+
+top_level
+  body:
+    block
+      stmt:
+        import_declaration
+          pattern: bulk_importing_pattern "import Foundation"
+          imported_expr:
+            name_expr
+              identifier: identifier "Foundation"
+
+===
+Import with dotted path (two parts)
+===
+
+import Foundation.Networking
+
+---
+
+source_file
+  statement:
+    import_declaration
+      name:
+        identifier
+          part:
+            simple_identifier "Foundation"
+            simple_identifier "Networking"
+
+---
+
+top_level
+  body:
+    block
+      stmt:
+        import_declaration
+          pattern: bulk_importing_pattern "import Foundation.Networking"
+          imported_expr:
+            member_access_expr
+              base:
+                name_expr
+                  identifier: identifier "Foundation"
+              member: identifier "Networking"
+
+===
+Import with deeply nested path (three parts)
+===
+
+import Foundation.Networking.URLSession
+
+---
+
+source_file
+  statement:
+    import_declaration
+      name:
+        identifier
+          part:
+            simple_identifier "Foundation"
+            simple_identifier "Networking"
+            simple_identifier "URLSession"
+
+---
+
+top_level
+  body:
+    block
+      stmt:
+        import_declaration
+          pattern: bulk_importing_pattern "import Foundation.Networking.URLSession"
+          imported_expr:
+            member_access_expr
+              base:
+                member_access_expr
+                  base:
+                    name_expr
+                      identifier: identifier "Foundation"
+                  member: identifier "Networking"
+              member: identifier "URLSession"
+
+===
+Scoped import uses name_pattern
+===
+
+import struct Foundation.Date
+
+---
+
+source_file
+  statement:
+    import_declaration
+      name:
+        identifier
+          part:
+            simple_identifier "Foundation"
+            simple_identifier "Date"
+      scoped_import_kind: struct
+
+---
+
+top_level
+  body:
+    block
+      stmt:
+        import_declaration
+          modifier: modifier "struct"
+          pattern:
+            name_pattern
+              identifier: identifier "Date"
+          imported_expr:
+            member_access_expr
+              base:
+                name_expr
+                  identifier: identifier "Foundation"
+              member: identifier "Date"

unified/extractor/tests/corpus/swift/functions.txt

@@ -555,3 +555,97 @@ top_level
                 name_pattern
                   identifier: identifier "x"
           return_type: unsupported_node "T"
+
+===
+Leading-dot expression value
+===
+
+let x = .foo
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "x"
+          value:
+            prefix_expression
+              operation: .
+              target: simple_identifier "foo"
+
+---
+
+top_level
+  body:
+    block
+      stmt:
+        variable_declaration
+          modifier: modifier "let"
+          pattern:
+            name_pattern
+              identifier: identifier "x"
+          value:
+            member_access_expr
+              base: inferred_type_expr ".foo"
+              member: identifier "foo"
+
+===
+Leading-dot expression call
+===
+
+let y = .some(1)
+
+---
+
+source_file
+  statement:
+    property_declaration
+      binding:
+        value_binding_pattern
+          mutability: let
+      declarator:
+        property_binding
+          name:
+            pattern
+              bound_identifier: simple_identifier "y"
+          value:
+            call_expression
+              function:
+                prefix_expression
+                  operation: .
+                  target: simple_identifier "some"
+              suffix:
+                call_suffix
+                  arguments:
+                    value_arguments
+                      argument:
+                        value_argument
+                          value: integer_literal "1"
+
+---
+
+top_level
+  body:
+    block
+      stmt:
+        variable_declaration
+          modifier: modifier "let"
+          pattern:
+            name_pattern
+              identifier: identifier "y"
+          value:
+            call_expr
+              argument:
+                argument
+                  value: int_literal "1"
+              callee:
+                member_access_expr
+                  base: inferred_type_expr ".some"
+                  member: identifier "some"