Merge pull request #79453 from rintaro/astgen-minus-number

[ASTGen] Generate "minus" number literal expression

Author: rintaro

include/swift/AST/ASTBridging.h

@@ -1837,6 +1837,11 @@ BridgedFloatLiteralExpr_createParsed(BridgedASTContext cContext,
                                      BridgedStringRef cStr,
                                      BridgedSourceLoc cTokenLoc);
 
+SWIFT_NAME("BridgedFloatLiteralExpr.setNegative(self:loc:)")
+BRIDGED_INLINE void
+BridgedFloatLiteralExpr_setNegative(BridgedFloatLiteralExpr cExpr,
+                                    BridgedSourceLoc cLoc);
+
 SWIFT_NAME("BridgedForceTryExpr.createParsed(_:tryLoc:subExpr:exclaimLoc:)")
 BridgedForceTryExpr
 BridgedForceTryExpr_createParsed(BridgedASTContext cContext,
@@ -1878,6 +1883,11 @@ BridgedIntegerLiteralExpr_createParsed(BridgedASTContext cContext,
                                        BridgedStringRef cStr,
                                        BridgedSourceLoc cTokenLoc);
 
+SWIFT_NAME("BridgedIntegerLiteralExpr.setNegative(self:loc:)")
+BRIDGED_INLINE void
+BridgedIntegerLiteralExpr_setNegative(BridgedIntegerLiteralExpr cExpr,
+                                      BridgedSourceLoc cLoc);
+
 SWIFT_NAME("BridgedInterpolatedStringLiteralExpr.createParsed(_:loc:"
            "literalCapacity:interpolationCount:appendingExpr:)")
 BridgedInterpolatedStringLiteralExpr

include/swift/AST/ASTBridgingImpl.h

@@ -648,6 +648,20 @@ BridgedVarDecl BridegedCaptureListEntry_getVar(BridgedCaptureListEntry entry) {
   return entry.unbridged().getVar();
 }
 
+//===----------------------------------------------------------------------===//
+// MARK: NumberLiteralExpr
+//===----------------------------------------------------------------------===//
+
+void BridgedFloatLiteralExpr_setNegative(BridgedFloatLiteralExpr cExpr,
+                                         BridgedSourceLoc cLoc) {
+  cExpr.unbridged()->setNegative(cLoc.unbridged());
+}
+
+void BridgedIntegerLiteralExpr_setNegative(BridgedIntegerLiteralExpr cExpr,
+                                           BridgedSourceLoc cLoc) {
+  cExpr.unbridged()->setNegative(cLoc.unbridged());
+}
+
 SWIFT_END_NULLABILITY_ANNOTATIONS
 
 #endif // SWIFT_AST_ASTBRIDGINGIMPL_H

lib/ASTGen/Sources/ASTGen/Exprs.swift

@@ -91,7 +91,7 @@ extension ASTGenVisitor {
     case .postfixOperatorExpr(let node):
       return self.generate(postfixOperatorExpr: node).asExpr
     case .prefixOperatorExpr(let node):
-      return self.generate(prefixOperatorExpr: node).asExpr
+      return self.generate(prefixOperatorExpr: node)
     case .regexLiteralExpr(let node):
       return self.generate(regexLiteralExpr: node).asExpr
     case .sequenceExpr(let node):
@@ -1099,15 +1099,27 @@ extension ASTGenVisitor {
     )
   }
 
-  func generate(prefixOperatorExpr node: PrefixOperatorExprSyntax) -> BridgedPrefixUnaryExpr {
-    return .createParsed(
+  func generate(prefixOperatorExpr node: PrefixOperatorExprSyntax) -> BridgedExpr {
+    if node.operator.rawText == "-" {
+      if let subNode = node.expression.as(IntegerLiteralExprSyntax.self) {
+        let literal = self.generate(integerLiteralExpr: subNode)
+        literal.setNegative(loc: self.generateSourceLoc(node.operator))
+        return literal.asExpr
+      }
+      if let subNode = node.expression.as(FloatLiteralExprSyntax.self) {
+        let literal = self.generate(floatLiteralExpr: subNode)
+        literal.setNegative(loc: self.generateSourceLoc(node.operator))
+        return literal.asExpr
+      }
+    }
+    return BridgedPrefixUnaryExpr.createParsed(
       self.ctx,
       operator: self.createUnresolvedDeclRefExpr(
         token: node.operator,
         kind: .prefixOperator
       ).asExpr,
       operand: self.generate(expr: node.expression)
-    )
+    ).asExpr
   }
 
   func generate(regexLiteralExpr node: RegexLiteralExprSyntax) -> BridgedRegexLiteralExpr {

test/ASTGen/exprs.swift

@@ -25,8 +25,8 @@ func test1(x: Int, fn: (Int) -> Int) async throws -> Int {
     true
 
   let arlit = [0]
-  let tuple = (0, 1)
-  let diclit = [0: 1, 2: 3]
+  let tuple = (0, -21.4)
+  let diclit = [0: 1, 2: -3]
 
   return fn(x)
 }