[ASTPrinter] More expression printing

Author: louisdh

include/swift/AST/PrintOptions.h

@@ -647,14 +647,7 @@ struct PrintOptions {
   ///
   /// This is only intended for debug output.
   static PrintOptions printEverything() {
-    PrintOptions result = printVerbose();
-    result.ExcludeAttrList.clear();
-    result.ExcludeAttrList.push_back(DAK_FixedLayout);
-    result.PrintStorageRepresentationAttrs = true;
-    result.AbstractAccessors = false;
-    result.PrintAccess = true;
-    result.SkipEmptyExtensionDecls = false;
-    result.SkipMissingMemberPlaceholders = false;
+    PrintOptions result = printDeclarations();
     result.FunctionDefinitions = true;
     result.PrintExprs = true;
     return result;

lib/AST/ASTPrinter.cpp

@@ -1316,6 +1316,7 @@ void PrintAST::printPattern(const Pattern *pattern) {
 
   case PatternKind::OptionalSome:
     printPattern(cast<OptionalSomePattern>(pattern)->getSubPattern());
+    Printer << '?';
     break;
 
   case PatternKind::Bool:
@@ -4366,7 +4367,6 @@ void PrintAST::visitLazyInitializerExpr(LazyInitializerExpr *expr) {
 }
 
 void PrintAST::visitOpenExistentialExpr(OpenExistentialExpr *expr) {
-  visit(expr->getValueProvidingExpr());
   visit(expr->getExistentialValue());
   visit(expr->getSubExpr());
 }
@@ -4399,13 +4399,22 @@ void PrintAST::visitUnresolvedMemberExpr(UnresolvedMemberExpr *expr) {
 }
 
 void PrintAST::visitDiscardAssignmentExpr(DiscardAssignmentExpr *expr) {
+  Printer << "_";
 }
 
 void PrintAST::visitEditorPlaceholderExpr(EditorPlaceholderExpr *expr) {
 }
 
 void PrintAST::visitForcedCheckedCastExpr(ForcedCheckedCastExpr *expr) {
   visit(expr->getSubExpr());
+  Printer << " as! ";
+  printType(expr->getCastType());
+}
+
+void PrintAST::visitConditionalCheckedCastExpr(ConditionalCheckedCastExpr *expr) {
+  visit(expr->getSubExpr());
+  Printer << " as? ";
+  printType(expr->getCastType());
 }
 
 void PrintAST::visitOverloadedDeclRefExpr(OverloadedDeclRefExpr *expr) {
@@ -4468,10 +4477,6 @@ void PrintAST::visitClassMetatypeToObjectExpr(ClassMetatypeToObjectExpr *expr) {
 void PrintAST::visitAppliedPropertyWrapperExpr(AppliedPropertyWrapperExpr *expr) {
 }
 
-void PrintAST::visitConditionalCheckedCastExpr(ConditionalCheckedCastExpr *expr) {
-  visit(expr->getSubExpr());
-}
-
 void PrintAST::visitDifferentiableFunctionExpr(DifferentiableFunctionExpr *expr) {
   visit(expr->getSubExpr());
 }
@@ -4535,8 +4540,8 @@ void PrintAST::visitBraceStmt(BraceStmt *stmt) {
 }
 
 void PrintAST::visitReturnStmt(ReturnStmt *stmt) {
+  Printer << tok::kw_return;
   if (stmt->hasResult()) {
-    Printer << tok::kw_return;
     Printer << " ";
     visit(stmt->getResult());
   }

test/expr/print/protocol.swift

@@ -0,0 +1,24 @@
+// RUN: %target-swift-frontend -print-ast %s 2>&1 | %FileCheck %s
+
+protocol Archivable {
+  func archive(version: String)
+}
+// CHECK: internal protocol Archivable {
+// CHECK:   func archive(version: String)
+// CHECK: }
+
+func archive(_ a: Archivable) {
+  a.archive(version: "1")
+}
+// CHECK: internal func archive(_ a: Archivable) {
+// CHECK:   a.archive(version: "1")
+// CHECK: }
+
+func cast(_ a: Any) {
+  let conditional = a as? Archivable
+  let forced = a as! Archivable
+}
+// CHECK: internal func cast(_ a: Any) {
+// CHECK:   @_hasInitialValue private let conditional: Archivable? = a as? Archivable
+// CHECK:   @_hasInitialValue private let forced: Archivable = a as! Archivable
+// CHECK: }

test/expr/print/switch.swift

@@ -26,3 +26,33 @@ func test(payload: Payload) -> Int? {
 // CHECK-LABEL:   return nil
 // CHECK-LABEL: }
 // CHECK-LABEL:}
+
+func process(payload: Payload) {
+  if case .empty = payload {
+    return
+  }
+  _ = test(payload: payload)
+}
+// CHECK-LABEL: internal func process(payload: Payload) {
+// CHECK-LABEL:   if .empty = payload {
+// CHECK-LABEL:     return
+// CHECK-LABEL:   }
+// CHECK-LABEL:   _ = test(payload: payload)
+// CHECK-LABEL: }
+
+func foo(_ x: Int?) {
+  switch x {
+  case let x?:
+    break
+  case nil:
+    break
+  }
+}
+// CHECK-LABEL: internal func foo(_ x: Int?) {
+// CHECK-LABEL:   switch x {
+// CHECK-LABEL:   case let x?:
+// CHECK-LABEL:     break
+// CHECK-LABEL:   case .none:
+// CHECK-LABEL:     break
+// CHECK-LABEL:   }
+// CHECK-LABEL: }