Merge pull request swiftlang#63565 from DougGregor/macro-syntax-cleanup

Author: DougGregor

include/swift/AST/Decl.h

@@ -8358,12 +8358,11 @@ class MacroDecl : public GenericContext, public ValueDecl {
   /// The location of the 'macro' keyword.
   SourceLoc macroLoc;
 
-  /// The parameter list for a function-like macro.
+  /// The parameter list.
   ParameterList *parameterList;
 
-  /// Where the '->' or ':' is located, for a function- or value-like macro,
-  /// respectively.
-  SourceLoc arrowOrColonLoc;
+  /// Where the '->' is located, if present.
+  SourceLoc arrowLoc;
 
   /// The result type.
   TypeLoc resultType;
@@ -8375,7 +8374,7 @@ class MacroDecl : public GenericContext, public ValueDecl {
   MacroDecl(SourceLoc macroLoc, DeclName name, SourceLoc nameLoc,
             GenericParamList *genericParams,
             ParameterList *parameterList,
-            SourceLoc arrowOrColonLoc,
+            SourceLoc arrowLoc,
             TypeRepr *resultType,
             Expr *definition,
             DeclContext *parent);

lib/AST/Decl.cpp

@@ -9820,14 +9820,14 @@ MacroDecl::MacroDecl(
     SourceLoc macroLoc, DeclName name, SourceLoc nameLoc,
     GenericParamList *genericParams,
     ParameterList *parameterList,
-    SourceLoc arrowOrColonLoc,
+    SourceLoc arrowLoc,
     TypeRepr *resultType,
     Expr *definition,
     DeclContext *parent
 ) : GenericContext(DeclContextKind::MacroDecl, parent, genericParams),
     ValueDecl(DeclKind::Macro, parent, name, nameLoc),
     macroLoc(macroLoc), parameterList(parameterList),
-    arrowOrColonLoc(arrowOrColonLoc),
+    arrowLoc(arrowLoc),
     resultType(resultType),
     definition(definition) {
 
@@ -9849,6 +9849,8 @@ SourceRange MacroDecl::getSourceRange() const {
   SourceLoc endLoc = getNameLoc();
   if (parameterList)
     endLoc = parameterList->getEndLoc();
+  if (resultType.getSourceRange().isValid())
+    endLoc = resultType.getSourceRange().End;
   if (definition)
     endLoc = definition->getEndLoc();
   if (auto trailing = getTrailingWhereClause())

lib/IDE/CompletionLookup.cpp

@@ -1793,7 +1793,7 @@ void CompletionLookup::addMacroExpansion(const MacroDecl *MD,
   addValueBaseName(Builder, MD->getBaseIdentifier());
 
   Type macroType = MD->getInterfaceType();
-  if (MD->parameterList && macroType->is<FunctionType>()) {
+  if (MD->parameterList && MD->parameterList->size() > 0) {
     Builder.addLeftParen();
     addCallArgumentPatterns(Builder, macroType->castTo<FunctionType>(),
                             MD->parameterList,

lib/Parse/ParseDecl.cpp

@@ -9487,40 +9487,30 @@ ParserResult<MacroDecl> Parser::parseDeclMacro(DeclAttributes &attributes) {
 
   // Parse the macro signature.
   ParameterList *parameterList = nullptr;
-  SourceLoc arrowOrColonLoc;
+  SourceLoc arrowLoc;
   TypeRepr *resultType = nullptr;
   DeclName macroFullName;
-  if (consumeIf(tok::colon, arrowOrColonLoc)) {
-    // Value-like macros.
-    auto type = parseType(diag::expected_macro_value_type);
-    status |= type;
+
+  // Parameter list.
+  SmallVector<Identifier, 2> namePieces;
+  auto parameterResult = parseSingleParameterClause(
+      ParameterContextKind::Macro, &namePieces, nullptr);
+  status |= parameterResult;
+  parameterList = parameterResult.getPtrOrNull();
+
+  // ->
+  if (consumeIf(tok::arrow, arrowLoc)) {
+    // Result type.
+    auto parsedResultType =
+        parseDeclResultType(diag::expected_type_macro_result);
+    resultType = parsedResultType.getPtrOrNull();
+    status |= parsedResultType;
     if (status.isErrorOrHasCompletion())
       return status;
-
-    resultType = type.getPtrOrNull();
-    macroFullName = macroName;
-  } else {
-    // Parameter list.
-    SmallVector<Identifier, 2> namePieces;
-    auto parameterResult = parseSingleParameterClause(
-        ParameterContextKind::Macro, &namePieces, nullptr);
-    status |= parameterResult;
-    parameterList = parameterResult.getPtrOrNull();
-
-    // ->
-    if (consumeIf(tok::arrow, arrowOrColonLoc)) {
-      // Result type.
-      auto parsedResultType =
-          parseDeclResultType(diag::expected_type_macro_result);
-      resultType = parsedResultType.getPtrOrNull();
-      status |= parsedResultType;
-      if (status.isErrorOrHasCompletion())
-        return status;
-    }
-
-    macroFullName = DeclName(Context, macroName, namePieces);
   }
 
+  macroFullName = DeclName(Context, macroName, namePieces);
+
   // Parse '=' <expression>
   Expr *definition = nullptr;
   if (consumeIf(tok::equal)) {
@@ -9534,7 +9524,7 @@ ParserResult<MacroDecl> Parser::parseDeclMacro(DeclAttributes &attributes) {
   // Create the macro declaration.
   auto *macro = new (Context) MacroDecl(
       macroLoc, macroFullName, macroNameLoc, genericParams, parameterList,
-      arrowOrColonLoc, resultType, definition, CurDeclContext);
+      arrowLoc, resultType, definition, CurDeclContext);
   macro->getAttrs() = attributes;
 
   // Parse a 'where' clause if present.

test/IDE/complete_pound_expr_macros.swift

@@ -5,8 +5,8 @@
 
 import ObjectiveC
 
-macro myLine: Int = A.B
-macro myFilename<T: ExpressiblyByStringLiteral>: T = A.B
+macro myLine() -> Int = A.B
+macro myFilename<T: ExpressiblyByStringLiteral>() -> T = A.B
 macro myStringify<T>(_: T) -> (T, String) = A.B
 
 struct Color { }

test/Macros/macro_availability_macosx.swift

@@ -4,9 +4,9 @@
 @available(macOS 12.0, *)
 struct X { }
 
-@freestanding(expression) macro m1: X = #externalMacro(module: "A", type: "B") // expected-error{{'X' is only available in macOS 12.0 or newer}}
-// expected-warning@-1{{external macro implementation type 'A.B' could not be found for macro 'm1'}}
+@freestanding(expression) macro m1() -> X = #externalMacro(module: "A", type: "B") // expected-error{{'X' is only available in macOS 12.0 or newer}}
+// expected-warning@-1{{external macro implementation type 'A.B' could not be found for macro 'm1()'}}
 
 @available(macOS 12.0, *)
-@freestanding(expression) macro m2: X = #externalMacro(module: "A", type: "B")
-// expected-warning@-1{{external macro implementation type 'A.B' could not be found for macro 'm2'}}
+@freestanding(expression) macro m2() -> X = #externalMacro(module: "A", type: "B")
+// expected-warning@-1{{external macro implementation type 'A.B' could not be found for macro 'm2()'}}

test/Macros/macros_diagnostics.swift

@@ -18,18 +18,18 @@ protocol P { }
 
 internal struct X { } // expected-note{{type declared here}}
 
-@freestanding(expression) public macro createAnX: X = #externalMacro(module: "BuiltinMacros", type: "Blah")
+@freestanding(expression) public macro createAnX() -> X = #externalMacro(module: "BuiltinMacros", type: "Blah")
 // expected-error@-1{{macro cannot be declared public because its result type uses an internal type}}
 // expected-warning@-2{{external macro implementation type}}
 
-@freestanding(expression) macro m1: Int = #externalMacro(module: "BuiltinMacros", type: "Blah")
+@freestanding(expression) macro m1() -> Int = #externalMacro(module: "BuiltinMacros", type: "Blah")
 // expected-warning@-1{{external macro implementation type}}
-@freestanding(expression) macro m1: Float = #externalMacro(module: "BuiltinMacros", type: "Blah")
+@freestanding(expression) macro m1() -> Float = #externalMacro(module: "BuiltinMacros", type: "Blah")
 // expected-warning@-1{{external macro implementation type}}
 
-@freestanding(expression) macro m2: Int = #externalMacro(module: "BuiltinMacros", type: "Blah") // expected-note{{'m2' previously declared here}}
+@freestanding(expression) macro m2() -> Int = #externalMacro(module: "BuiltinMacros", type: "Blah") // expected-note{{'m2()' previously declared here}}
 // expected-warning@-1{{external macro implementation type}}
-@freestanding(expression) macro m2: Int = #externalMacro(module: "BuiltinMacros", type: "Blah") // expected-error{{invalid redeclaration of 'm2'}}
+@freestanding(expression) macro m2() -> Int = #externalMacro(module: "BuiltinMacros", type: "Blah") // expected-error{{invalid redeclaration of 'm2()'}}
 // expected-warning@-1{{external macro implementation type}}
 
 @freestanding(expression) macro m3(_: Int) -> Int = #externalMacro(module: "BuiltinMacros", type: "Blah")
@@ -43,9 +43,9 @@ internal struct X { } // expected-note{{type declared here}}
 // expected-warning@-1{{external macro implementation type}}
 
 struct ZZZ {
-  macro m5: Int = #externalMacro(module: "BuiltinMacros", type: "Blah")
-  // expected-error@-1{{macro 'm5' can only be declared at file scope}}
-  // expected-error@-2{{macro 'm5' must declare its applicable roles}}
+  macro m5() -> Int = #externalMacro(module: "BuiltinMacros", type: "Blah")
+  // expected-error@-1{{macro 'm5()' can only be declared at file scope}}
+  // expected-error@-2{{macro 'm5()' must declare its applicable roles}}
   // expected-warning@-3{{external macro implementation type}}
 }
 

test/Macros/parsing.swift

@@ -2,14 +2,14 @@
 protocol P { }
 protocol Q { associatedtype Assoc }
 
-@freestanding(expression) macro m1: Int = #externalMacro(module: "A", type: "M1")
-// expected-warning@-1{{external macro implementation type 'A.M1' could not be found for macro 'm1'; the type must be public and provided via '-load-plugin-library'}}
+@freestanding(expression) macro m1() -> Int = #externalMacro(module: "A", type: "M1")
+// expected-warning@-1{{external macro implementation type 'A.M1' could not be found for macro 'm1()'; the type must be public and provided via '-load-plugin-library'}}
 @freestanding(expression) macro m2(_: Int) = #externalMacro(module: "A", type: "M2")
 // expected-warning@-1{{external macro implementation type 'A.M2' could not be found for macro 'm2'; the type must be public and provided via '-load-plugin-library'}}
 @freestanding(expression) macro m3(a b: Int) -> Int = #externalMacro(module: "A", type: "M3")
 // expected-warning@-1{{external macro implementation type 'A.M3' could not be found for macro 'm3(a:)'; the type must be public and provided via '-load-plugin-library'}}
-@freestanding(expression) macro m4<T: Q>: T = #externalMacro(module: "A", type: "M4") where T.Assoc: P
-// expected-warning@-1{{external macro implementation type 'A.M4' could not be found for macro 'm4'; the type must be public and provided via '-load-plugin-library'}}
+@freestanding(expression) macro m4<T: Q>() -> T = #externalMacro(module: "A", type: "M4") where T.Assoc: P
+// expected-warning@-1{{external macro implementation type 'A.M4' could not be found for macro 'm4()'; the type must be public and provided via '-load-plugin-library'}}
 @freestanding(expression) macro m5<T: P>(_: T) = #externalMacro(module: "A", type: "M4")
 // expected-warning@-1{{external macro implementation type 'A.M4' could not be found for macro 'm5'; the type must be public and provided via '-load-plugin-library'}}
 
@@ -36,8 +36,8 @@ macro m10(_: String) = #externalMacro(module: "A", type: "M4")
   accessor,
   names: overloaded, arbitrary, named(hello), prefixed(_), suffixed(_favorite)
 )
-macro am1: Void
-// expected-error@-1{{macro 'am1' requires a definition}}
+macro am1()
+// expected-error@-1{{macro 'am1()' requires a definition}}
 
 @attached(
   accessor,
@@ -46,5 +46,5 @@ macro am1: Void
   named, // expected-error{{introduced name kind 'named' requires a single argument '(name)'}}
   arbitrary(a) // expected-error{{introduced name kind 'arbitrary' must not have an argument}}
 )
-macro am2: Void
-// expected-error@-1{{macro 'am2' requires a definition}}
+macro am2() -> Void
+// expected-error@-1{{macro 'am2()' requires a definition}}

test/ModuleInterface/macros.swift

@@ -12,14 +12,14 @@
 @freestanding(expression) public macro publicStringify<T>(_ value: T) -> (T, String) = #externalMacro(module: "SomeModule", type: "StringifyMacro")
 
 // CHECK: #if compiler(>=5.3) && $FreestandingExpressionMacros && $Macros
-// CHECK: @freestanding(expression) public macro publicLine<T>: T = #externalMacro(module: "SomeModule", type: "Line") where T : Swift.ExpressibleByIntegerLiteral
+// CHECK: @freestanding(expression) public macro publicLine<T>() -> T = #externalMacro(module: "SomeModule", type: "Line") where T : Swift.ExpressibleByIntegerLiteral
 // CHECK-NEXT: #endif
-@freestanding(expression) public macro publicLine<T: ExpressibleByIntegerLiteral>: T = #externalMacro(module: "SomeModule", type: "Line")
+@freestanding(expression) public macro publicLine<T: ExpressibleByIntegerLiteral>() -> T = #externalMacro(module: "SomeModule", type: "Line")
 
 // CHECK: #if compiler(>=5.3) && $Macros
-// CHECK: @attached(accessor) public macro myWrapper: Swift.Void = #externalMacro(module: "SomeModule", type: "Wrapper")
+// CHECK: @attached(accessor) public macro myWrapper() -> () = #externalMacro(module: "SomeModule", type: "Wrapper")
 // CHECK-NEXT: #endif
-@attached(accessor) public macro myWrapper: Void = #externalMacro(module: "SomeModule", type: "Wrapper")
+@attached(accessor) public macro myWrapper() = #externalMacro(module: "SomeModule", type: "Wrapper")
 
 // CHECK-NOT: internalStringify
 @freestanding(expression) macro internalStringify<T>(_ value: T) -> (T, String) = #externalMacro(module: "SomeModule", type: "StringifyMacro")