Merge pull request #61378 from beccadax/an-argument-about-attribution

[NFC] Add parsing helpers for @attr(<identifier>)

Author: beccadax

include/swift/AST/DiagnosticsParse.def

@@ -1469,6 +1469,9 @@ ERROR(attr_expected_integer_literal,none,
 ERROR(attr_expected_option_such_as,none,
       "expected '%0' option such as '%1'", (StringRef, StringRef))
 
+ERROR(attr_expected_option_identifier,none,
+      "expected '%0' option to be an identifier", (StringRef))
+
 ERROR(attr_unknown_option,none,
       "unknown option '%0' for attribute '%1'", (StringRef, StringRef))
 
@@ -1482,18 +1485,9 @@ ERROR(attr_expected_colon_after_label,none,
 ERROR(alignment_must_be_positive_integer,none,
       "alignment value must be a positive integer literal", ())
 
-ERROR(swift_native_objc_runtime_base_must_be_identifier,none,
-      "@_swift_native_objc_runtime_base class name must be an identifier", ())
-
-ERROR(objc_runtime_name_must_be_identifier,none,
-      "@_objcRuntimeName name must be an identifier", ())
-
 ERROR(attr_only_at_non_local_scope, none,
       "attribute '%0' can only be used in a non-local scope", (StringRef))
 
-ERROR(projection_value_property_not_identifier,none,
-      "@_projectedValueProperty name must be an identifier", ())
-
 // Access control
 ERROR(attr_access_expected_set,none,
       "expected 'set' as subject of '%0' modifier", (StringRef))

include/swift/AST/KnownIdentifiers.def

@@ -316,6 +316,18 @@ IDENTIFIER(storageKeyPath)
 IDENTIFIER(memberwise)
 IDENTIFIER_WITH_NAME(localStorageVar, "_storage")
 
+// Attribute options
+IDENTIFIER_(_always)
+IDENTIFIER_(assumed)
+IDENTIFIER(checked)
+IDENTIFIER(never)
+IDENTIFIER(none)
+IDENTIFIER(safe)
+IDENTIFIER(size)
+IDENTIFIER(speed)
+IDENTIFIER(unchecked)
+IDENTIFIER(unsafe)
+
 // The singleton instance of TupleTypeDecl in the Builtin module
 IDENTIFIER(TheTupleType)
 

include/swift/Parse/Parser.h

@@ -896,7 +896,7 @@ class Parser {
 
   /// Parse the specified expected token and return its location on success.  On failure, emit the specified
   /// error diagnostic,  a note at the specified note location, and return the location of the previous token.
-  bool parseMatchingToken(tok K, SourceLoc &TokLoc, Diag<> ErrorDiag,
+  bool parseMatchingToken(tok K, SourceLoc &TokLoc, Diagnostic ErrorDiag,
                           SourceLoc OtherLoc);
 
   /// Returns the proper location for a missing right brace, parenthesis, etc.