Disallow non-decimal line numbers as argument to #sourceLocation

rdar://121668395

Author: ahoppen

Sources/SwiftParser/Directives.swift

@@ -201,7 +201,14 @@ extension Parser {
 
       let (unexpectedBeforeLine, line) = self.expect(.keyword(.line))
       let (unexpectedBeforeLineColon, lineColon) = self.expect(.colon)
-      let lineNumber = self.expectWithoutRecovery(.integerLiteral)
+      var lineNumber = self.expectWithoutRecovery(.integerLiteral)
+      if !lineNumber.tokenText.allSatisfy({ Unicode.Scalar($0).isDigit }) {
+        let diagnostic = TokenDiagnostic(
+          swiftVersion < .v6 ? .unexpectedNonDecimalIntegerLiteralWarning : .unexpectedNonDecimalIntegerLiteralError,
+          byteOffset: 0
+        )
+        lineNumber = lineNumber.tokenView.withTokenDiagnostic(tokenDiagnostic: diagnostic, arena: self.arena)
+      }
 
       arguments = RawPoundSourceLocationArgumentsSyntax(
         unexpectedBeforeFile,

Sources/SwiftParserDiagnostics/LexerDiagnosticMessages.swift

@@ -78,6 +78,7 @@ public enum StaticTokenError: String, DiagnosticMessage {
   case spaceAtStartOfRegexLiteral = "bare slash regex literal may not start with space"
   case spaceAtEndOfRegexLiteral = "bare slash regex literal may not end with space"
   case multilineRegexClosingNotOnNewline = "multi-line regex closing delimiter must appear on new line"
+  case unexpectedNonDecimalIntegerLiteral = "unexpected non-decimal integer literal"
   case unprintableAsciiCharacter = "unprintable ASCII character found in source file"
   case unterminatedBlockComment = "unterminated '/*' comment"
 
@@ -166,7 +167,7 @@ public struct InvalidDigitInIntegerLiteral: TokenError {
 
 /// Downgrades a ``TokenError`` to a ``TokenWarning`` until Swift 6.
 public struct ErrorToWarningDowngrade: TokenWarning {
-  public let error: TokenError
+  public let error: DiagnosticMessage
 
   public var message: String {
     return "\(error.message); this is an error in Swift 6"
@@ -223,6 +224,8 @@ public extension SwiftSyntax.TokenDiagnostic {
     case .spaceAtStartOfRegexLiteral: return StaticTokenError.spaceAtStartOfRegexLiteral
     case .tokenDiagnosticOffsetOverflow: return StaticTokenError.tokenDiagnosticOffsetOverflow
     case .unexpectedBlockCommentEnd: return StaticTokenError.unexpectedBlockCommentEnd
+    case .unexpectedNonDecimalIntegerLiteralWarning: return ErrorToWarningDowngrade(error: StaticTokenError.unexpectedNonDecimalIntegerLiteral)
+    case .unexpectedNonDecimalIntegerLiteralError: return StaticTokenError.unexpectedNonDecimalIntegerLiteral
     case .unicodeCurlyQuote: return StaticTokenError.unicodeCurlyQuote
     case .unprintableAsciiCharacter: return StaticTokenError.unprintableAsciiCharacter
     case .unterminatedBlockComment: return StaticTokenError.unterminatedBlockComment

Sources/SwiftSyntax/TokenDiagnostic.swift

@@ -56,6 +56,8 @@ public struct TokenDiagnostic: Hashable, Sendable {
     /// The lexer discovered an error but was not able to represent the offset of the error because it would overflow `LexerErrorOffset`.
     case tokenDiagnosticOffsetOverflow
     case unexpectedBlockCommentEnd
+    case unexpectedNonDecimalIntegerLiteralWarning
+    case unexpectedNonDecimalIntegerLiteralError
     case unicodeCurlyQuote
     case unprintableAsciiCharacter
     case unterminatedBlockComment
@@ -95,6 +97,8 @@ public struct TokenDiagnostic: Hashable, Sendable {
       case .spaceAtStartOfRegexLiteral: return .error
       case .tokenDiagnosticOffsetOverflow: return .error
       case .unexpectedBlockCommentEnd: return .error
+      case .unexpectedNonDecimalIntegerLiteralWarning: return .warning
+      case .unexpectedNonDecimalIntegerLiteralError: return .error
       case .unicodeCurlyQuote: return .error
       case .unprintableAsciiCharacter: return .error
       case .unterminatedBlockComment: return .error

Tests/SwiftParserTest/DirectiveTests.swift

@@ -153,6 +153,27 @@ final class DirectiveTests: ParserTestCase {
     )
   }
 
+  func testNonDecimalLineNumberInSourceLocation() {
+    assertParse(
+      #"""
+      #sourceLocation(file: "f.swift", line: 1️⃣0xff)
+      """#,
+      diagnostics: [
+        DiagnosticSpec(message: "unexpected non-decimal integer literal")
+      ]
+    )
+
+    assertParse(
+      #"""
+      #sourceLocation(file: "f.swift", line: 1️⃣0xff)
+      """#,
+      diagnostics: [
+        DiagnosticSpec(message: "unexpected non-decimal integer literal; this is an error in Swift 6", severity: .warning)
+      ],
+      swiftVersion: .v5
+    )
+  }
+
   public func testUnterminatedPoundIf() {
     assertParse(
       "#if test1️⃣",