tbs

Author: rintaro

Sources/SwiftParser/Declarations.swift

@@ -52,8 +52,8 @@ extension TokenConsumer {
     }
   }
 
-  /// Check if the current token is at a start of any declaration.
-  ///
+  /// Returns `true` if the current token represents the start of a declaration
+  /// item.
   ///
   /// - Parameters
   ///   - allowInitDecl: whether to consider 'init' a declaration in the context.

Sources/SwiftParser/Statements.swift

@@ -21,7 +21,6 @@ extension TokenConsumer {
   /// item.
   ///
   /// - Parameters:
-  ///   - allowRecovery: Whether to attempt to perform recovery.
   ///   - preferExpr: If either an expression or statement could be
   ///     parsed and this parameter is `true`, the function returns `false`
   ///     such that an expression can be parsed.
@@ -1022,7 +1021,6 @@ extension Parser.Lookahead {
   /// item.
   ///
   /// - Parameters:
-  ///   - allowRecovery: Whether to attempt to perform recovery.
   ///   - preferExpr: If either an expression or statement could be
   ///     parsed and this parameter is `true`, the function returns `false`
   ///     such that an expression can be parsed.

Sources/SwiftParser/TokenPrecedence.swift

@@ -38,16 +38,16 @@ enum TokenPrecedence: Comparable {
   case mediumPunctuator
   /// The closing delimiter of `weakBracketed`
   case weakBracketClose
-  /// Keywords that start a new statement.
-  case stmtKeyword
   /// The '{' token because it typically marks the body of a declaration.
   /// `closingDelimiter` must have type `strongPunctuator`
   case openingBrace(closingDelimiter: RawTokenKind)
   /// A punctuator that is a strong indicator that it separates two distinct parts of the source code, like two statements
   case strongPunctuator
   /// The closing delimiter of `strongBracketed`
   case closingBrace
-  /// Tokens that start a new declaration
+  /// Keywords that start a new statement.
+  case stmtKeyword
+  /// Keywords that start a new declaration
   case declKeyword
   case openingPoundIf
   case closingPoundIf
@@ -85,17 +85,17 @@ enum TokenPrecedence: Comparable {
       case .weakBracketClose:
         return 6
       case .strongPunctuator:
-        return 8
+        return 7
       case .openingBrace:
-        return 9
+        return 8
       case .declKeyword, .stmtKeyword:
-        return 10
+        return 9
       case .closingBrace:
-        return 11
+        return 10
       case .openingPoundIf:
-        return 12
+        return 11
       case .closingPoundIf:
-        return 13
+        return 12
       }
     }
 

Sources/SwiftParser/TopLevel.swift

@@ -133,24 +133,6 @@ extension Parser {
     )
   }
 
-  mutating func fixWithSemi(codeBlockItem item: RawCodeBlockItemSyntax.Item) -> RawCodeBlockItemSyntax? {
-    let semi = self.consume(if: .semicolon)
-    var trailingSemis: [RawTokenSyntax] = []
-    while let trailingSemi = self.consume(if: .semicolon) {
-      trailingSemis.append(trailingSemi)
-    }
-
-    if item.raw.isEmpty && semi == nil && trailingSemis.isEmpty {
-      return nil
-    }
-    return RawCodeBlockItemSyntax(
-      item: item,
-      semicolon: semi,
-      RawUnexpectedNodesSyntax(trailingSemis, arena: self.arena),
-      arena: self.arena
-    )
-  }
-
   /// Parse an individual item - either in a code block or at the top level.
   ///
   /// Returns `nil` if the parser did not consume any tokens while trying to