feat(swift): upgrade Swift parser to support Swift 6 syntax

phodal · phodal · commit e4aad6e96fc4 · 2026-01-20T20:55:17.000+08:00
- Add new Swift 6 keywords: async, await, actor, distributed,
  consuming, borrowing, nonisolated, isolated, sending, macro
- Support typed throws syntax: throws(ErrorType)
- Support async functions
- Support actor and distributed actor declarations
- Support ownership modifiers (consuming, borrowing) for parameters
- Support noncopyable types with ~Copyable syntax
- Add macro declaration support (#externalMacro)
- Update README with Swift language coverage

All 25 tests passing.
diff --git a/README.md b/README.md
@@ -25,9 +25,9 @@ Chapi (pronounced /tʃɑpi/) can also be read as “XP” in Chinese if you pron
 | Feature        | Java | Python | Go | Kotlin | TS/JS | C  | C# | Scala | C++ | Rust | Swift |
 |----------------|------|--------|----|--------|-------|----|----|-------|-----|------|-------|
 | HTTP API decl  | ✅    | 🆕     | ✅  | ✅      | ✅     | 🆕 | ✅  | ✅     | 🆕  | ✅    |       |
-| Syntax parsing | ✅    | ✅      | ✅  | ✅      | ✅     | ✅  | ✅  | ✅     | ✅   | ✅    | 🆕    |
-| Function calls | ✅    | ✅      | ✅  | ✅      | ✅     | ✅  | ✅  |       |     | ✅    |       |
-| Arch/package   | ✅    |        | ✅  | ✅      | ✅     | 🆕 | ✅  | ✅     | ✅   | ✅    |       |
+| Syntax parsing | ✅    | ✅      | ✅  | ✅      | ✅     | ✅  | ✅  | ✅     | ✅   | ✅    | ✅     |
+| Function calls | ✅    | ✅      | ✅  | ✅      | ✅     | ✅  | ✅  |       |     | ✅    | ✅     |
+| Arch/package   | ✅    |        | ✅  | ✅      | ✅     | 🆕 | ✅  | ✅     | ✅   | ✅    | ✅     |
 | Real-world     | ✅    |        |    | ✅      | ✅     |    |    |       |     |      |       |
 
 ### IDL stages
@@ -59,6 +59,7 @@ Tested language versions:
 - Kotlin
 - Rust: v1.60.0
 - Python: 2, 3
+- Swift: 5, 6 (with typed throws, async/await, actors, ownership modifiers)
 
 Gradle modules (by tier):
 
diff --git a/chapi-ast-swift/src/main/antlr/Swift5Lexer.g4 b/chapi-ast-swift/src/main/antlr/Swift5Lexer.g4
@@ -2,6 +2,7 @@
 // $antlr-format allowShortRulesOnASingleLine true, allowShortBlocksOnASingleLine true, minEmptyLines 0, alignSemicolons ownLine
 // $antlr-format alignColons trailing, singleLineOverrulesHangingColon true, alignLexerCommands true, alignLabels true, alignTrailers true
 
+// Swift 6 Lexer (upgraded from Swift 5)
 lexer grammar Swift5Lexer;
 // Insert here @header for C++ lexer.
 
@@ -48,6 +49,8 @@ RETURN             : 'return';
 THROW              : 'throw';
 THROWS             : 'throws';
 RETHROWS           : 'rethrows';
+ASYNC              : 'async';
+AWAIT              : 'await';
 INDIRECT           : 'indirect';
 INIT               : 'init';
 DEINIT             : 'deinit';
@@ -87,6 +90,26 @@ UNSAFE             : 'unsafe';
 MUTATING           : 'mutating';
 NONMUTATING        : 'nonmutating';
 FILE_PRIVATE       : 'fileprivate';
+
+// Swift 6 new keywords
+CONSUMING          : 'consuming';
+BORROWING          : 'borrowing';
+NONISOLATED        : 'nonisolated';
+ISOLATED           : 'isolated';
+SENDING            : 'sending';
+PACKAGE            : 'package';
+DISCARD            : 'discard';
+COPY               : 'copy';
+CONSUME            : 'consume';
+
+// Macro-related (Swift 5.9+)
+MACRO              : 'macro';
+FREESTANDING       : 'freestanding';
+ATTACHED           : 'attached';
+
+// Distributed actor (Swift 5.5+)
+DISTRIBUTED        : 'distributed';
+ACTOR              : 'actor';
 IS                 : 'is';
 TRY                : 'try';
 SUPER              : 'super';
@@ -148,6 +171,10 @@ HASH_KEYPATH       : '#keyPath';
 HASH_COLOR_LITERAL : '#colorLiteral';
 HASH_FILE_LITERAL  : '#fileLiteral';
 HASH_IMAGE_LITERAL : '#imageLiteral';
+
+// Swift 6 macro-related hash keywords
+HASH_EXTERNAL_MACRO: '#externalMacro';
+
 GETTER             : 'getter';
 SETTER             : 'setter';
 
diff --git a/chapi-ast-swift/src/main/antlr/Swift5Parser.g4 b/chapi-ast-swift/src/main/antlr/Swift5Parser.g4
@@ -1,6 +1,8 @@
 // $antlr-format alignTrailingComments true, columnLimit 150, minEmptyLines 1, maxEmptyLinesToKeep 1, reflowComments false, useTab false
 // $antlr-format allowShortRulesOnASingleLine false, allowShortBlocksOnASingleLine true, alignSemicolons hanging, alignColons hanging
 
+// Swift 6 Parser (upgraded from Swift 5)
+// Supports: typed throws, noncopyable types, ownership modifiers, macros, trailing commas
 parser grammar Swift5Parser;
 
 // Insert here @header for C++ parser.
@@ -418,13 +420,15 @@ declaration
         | enum_declaration
         | struct_declaration
         | class_declaration
+        | actor_declaration        // Swift 5.5+
         | protocol_declaration
         | initializer_declaration
         | deinitializer_declaration
         | extension_declaration
         | subscript_declaration
         | operator_declaration
         | precedence_group_declaration
+        | macro_declaration        // Swift 5.9+
     ) SEMI?
     ;
 
@@ -579,7 +583,18 @@ function_name
     ;
 
 function_signature
-    : parameter_clause (THROWS? | RETHROWS) function_result?
+    : parameter_clause async_clause? throw_clause? function_result?
+    ;
+
+// Swift 6: async clause
+async_clause
+    : ASYNC
+    ;
+
+// Swift 6: typed throws - throws(ErrorType)
+throw_clause
+    : THROWS (LPAREN type RPAREN)?
+    | RETHROWS
     ;
 
 function_result
@@ -599,12 +614,19 @@ parameter_list
     ;
 
 parameter
-    : attributes? external_parameter_name? local_parameter_name type_annotation (
+    : attributes? ownership_modifier? external_parameter_name? local_parameter_name type_annotation (
         default_argument_clause?
         | range_operator
     )
     ;
 
+// Swift 6: ownership modifiers for parameters
+ownership_modifier
+    : CONSUMING
+    | BORROWING
+    | INOUT
+    ;
+
 external_parameter_name
     : identifier
     ;
@@ -738,6 +760,28 @@ class_member
     | compiler_control_statement
     ;
 
+// Actor Declaration (Swift 5.5+)
+actor_declaration
+    : attributes? access_level_modifier? DISTRIBUTED? ACTOR actor_name generic_parameter_clause? type_inheritance_clause? generic_where_clause? actor_body
+    ;
+
+actor_name
+    : identifier
+    ;
+
+actor_body
+    : LCURLY actor_members RCURLY
+    ;
+
+actor_members
+    : actor_member*
+    ;
+
+actor_member
+    : declaration
+    | compiler_control_statement
+    ;
+
 // Protocol Declaration
 protocol_declaration
     : attributes? access_level_modifier? PROTOCOL protocol_name (
@@ -926,6 +970,12 @@ declaration_modifier
     | WEAK
     | access_level_modifier
     | mutation_modifier
+    // Swift 6 new modifiers
+    | NONISOLATED
+    | ISOLATED
+    | CONSUMING
+    | BORROWING
+    | DISTRIBUTED
     ;
 
 declaration_modifiers
@@ -1478,7 +1528,12 @@ type_inheritance_clause
     ;
 
 type_inheritance_list
-    : type_identifier (COMMA type_identifier)*
+    : type_inheritance_item (COMMA type_inheritance_item)*
+    ;
+
+// Swift 6: support ~Copyable (noncopyable) in inheritance
+type_inheritance_item
+    : TILDE? type_identifier
     ;
 
 // Identifiers
@@ -1571,6 +1626,16 @@ identifier
         | OPERATOR
         | DO
         | CATCH
+        // Swift 6 keywords that can also be identifiers
+        | ASYNC
+        | AWAIT
+        | ACTOR
+        | NONISOLATED
+        | ISOLATED
+        | CONSUMING
+        | BORROWING
+        | SENDING
+        | MACRO
     )
     | Identifier
     | BACKTICK (keyword | Identifier | DOLLAR) BACKTICK
@@ -1818,4 +1883,41 @@ interpolated_string_literal
         Quoted_multi_line_text
         | Interpolation_multi_line (expression | tuple_element COMMA tuple_element_list) RPAREN
     )* Multi_line_string_close
+    ;
+
+// ==================== Swift 5.9+ Macro Declarations ====================
+
+// Macro Declaration
+macro_declaration
+    : attributes? access_level_modifier? MACRO macro_name generic_parameter_clause? macro_signature generic_where_clause? macro_definition?
+    ;
+
+macro_name
+    : identifier
+    ;
+
+macro_signature
+    : parameter_clause (arrow_operator type)?
+    ;
+
+macro_definition
+    : EQUAL macro_expansion_expression
+    ;
+
+macro_expansion_expression
+    : HASH_EXTERNAL_MACRO LPAREN macro_arguments RPAREN
+    | HASH identifier LPAREN macro_arguments? RPAREN
+    ;
+
+macro_arguments
+    : macro_argument (COMMA macro_argument)*
+    ;
+
+macro_argument
+    : (identifier COLON)? expression
+    ;
+
+// Freestanding macro expression (used in expressions)
+freestanding_macro_expression
+    : HASH identifier generic_argument_clause? (LPAREN macro_arguments? RPAREN)? trailing_closures?
     ;
diff --git a/chapi-ast-swift/src/main/kotlin/chapi/ast/swiftast/SwiftFullIdentListener.kt b/chapi-ast-swift/src/main/kotlin/chapi/ast/swiftast/SwiftFullIdentListener.kt
@@ -182,6 +182,47 @@ class SwiftFullIdentListener(private val filePath: String) : Swift5ParserBaseLis
         finishDataStruct()
     }
 
+    // ==================== Actor Declaration (Swift 5.5+) ====================
+
+    override fun enterActor_declaration(ctx: Swift5Parser.Actor_declarationContext) {
+        val name = ctx.actor_name()?.text ?: return
+        
+        // Extract attributes and modifiers
+        val annotations = buildAnnotationsFromAttributes(ctx.attributes())
+        val accessModifier = buildAccessLevelModifier(ctx.access_level_modifier())
+        val modifiers = mutableListOf<String>()
+        
+        if (accessModifier.isNotEmpty()) {
+            modifiers.add(accessModifier)
+        }
+        
+        // Check for distributed modifier
+        if (ctx.DISTRIBUTED() != null) {
+            modifiers.add("distributed")
+        }
+        
+        val modifierAnnotations = modifiers.map { CodeAnnotation(Name = it) }
+        
+        val actorStruct = CodeDataStruct(
+            NodeName = name,
+            Type = DataStructType.CLASS, // Actor is similar to class
+            FilePath = filePath,
+            Position = ctx.toPosition(),
+            Annotations = annotations + modifierAnnotations
+        )
+        
+        // Parse inheritance
+        ctx.type_inheritance_clause()?.let { inheritanceCtx ->
+            actorStruct.Implements = buildInheritanceList(inheritanceCtx)
+        }
+        
+        stack.addLast(actorStruct)
+    }
+    
+    override fun exitActor_declaration(ctx: Swift5Parser.Actor_declarationContext) {
+        finishDataStruct()
+    }
+
     // ==================== Enum Declaration ====================
 
     override fun enterEnum_declaration(ctx: Swift5Parser.Enum_declarationContext) {
@@ -332,7 +373,7 @@ class SwiftFullIdentListener(private val filePath: String) : Swift5ParserBaseLis
         // Extract attributes and modifiers from function_head
         val functionHead = ctx.function_head()
         val annotations = buildAnnotationsFromAttributes(functionHead?.attributes())
-        val modifiers = buildModifiersFromDeclarationModifiers(functionHead?.declaration_modifiers())
+        val modifiers = buildModifiersFromDeclarationModifiers(functionHead?.declaration_modifiers()).toMutableList()
 
         val function = CodeFunction(
             Name = name,
@@ -348,13 +389,23 @@ class SwiftFullIdentListener(private val filePath: String) : Swift5ParserBaseLis
             function.Parameters += buildParameter(paramCtx)
         }
         
-        // Check for throws/rethrows
-        ctx.function_signature()?.let { sig ->
-            if (sig.THROWS() != null) {
-                function.Modifiers = function.Modifiers + "throws"
-            }
-            if (sig.RETHROWS() != null) {
+        // Check for async (Swift 5.5+)
+        ctx.function_signature()?.async_clause()?.let {
+            function.Modifiers = function.Modifiers + "async"
+        }
+        
+        // Check for throws/rethrows with typed throws support (Swift 6)
+        ctx.function_signature()?.throw_clause()?.let { throwClause ->
+            if (throwClause.RETHROWS() != null) {
                 function.Modifiers = function.Modifiers + "rethrows"
+            } else if (throwClause.THROWS() != null) {
+                // Check for typed throws: throws(ErrorType)
+                val errorType = throwClause.type()?.text
+                if (errorType != null) {
+                    function.Modifiers = function.Modifiers + "throws($errorType)"
+                } else {
+                    function.Modifiers = function.Modifiers + "throws"
+                }
             }
         }
         
@@ -621,6 +672,17 @@ class SwiftFullIdentListener(private val filePath: String) : Swift5ParserBaseLis
         // Build annotations from parameter attributes
         val annotations = ctx.attributes()?.attribute()?.map { buildAnnotation(it) } ?: listOf()
         
+        // Check for ownership modifier (Swift 6: consuming, borrowing, inout)
+        val modifiers = mutableListOf<String>()
+        ctx.ownership_modifier()?.let { ownershipCtx ->
+            when {
+                ownershipCtx.CONSUMING() != null -> modifiers.add("consuming")
+                ownershipCtx.BORROWING() != null -> modifiers.add("borrowing")
+                ownershipCtx.INOUT() != null -> modifiers.add("inout")
+                else -> { /* no modifier */ }
+            }
+        }
+        
         return CodeProperty(
             TypeValue = if (externalName.isNotEmpty() && externalName != localName) {
                 "$externalName $localName"
@@ -630,12 +692,22 @@ class SwiftFullIdentListener(private val filePath: String) : Swift5ParserBaseLis
             TypeType = typeAnnotation,
             DefaultValue = defaultValue,
             Annotations = annotations,
+            Modifiers = modifiers,
             TypeRef = if (typeAnnotation.isNotEmpty()) SwiftTypeRefBuilder.build(typeAnnotation) else null
         )
     }
     
     private fun buildInheritanceList(ctx: Swift5Parser.Type_inheritance_clauseContext): List<String> {
-        return ctx.type_inheritance_list()?.type_identifier()?.mapNotNull { it.text } ?: listOf()
+        // Swift 6: support ~Copyable syntax in inheritance
+        return ctx.type_inheritance_list()?.type_inheritance_item()?.mapNotNull { item ->
+            val typeText = item.type_identifier()?.text ?: return@mapNotNull null
+            // Check if it's a noncopyable type (~Copyable)
+            if (item.TILDE() != null) {
+                "~$typeText"
+            } else {
+                typeText
+            }
+        } ?: listOf()
     }
     
     private fun addFieldToCurrentScope(field: CodeField) {
diff --git a/chapi-ast-swift/src/test/kotlin/chapi/ast/swiftast/SwiftAnalyserTest.kt b/chapi-ast-swift/src/test/kotlin/chapi/ast/swiftast/SwiftAnalyserTest.kt
