Repeat does not get to participate in inline

Author: Azoy

Sources/_StringProcessing/PrintAsPattern.swift

@@ -121,7 +121,7 @@ extension PrettyPrinter {
       print("/* TODO: conditional */")
 
     case let .quantification(amount, kind, child):
-      let amount = amount.ast._patternBase
+      let amountStr = amount.ast._patternBase
       var kind = kind.ast?._patternBase ?? ""
 
       // If we've updated our quantification behavior, then use that. This
@@ -131,10 +131,10 @@ extension PrettyPrinter {
         kind = quantificationBehavior._patternBase
       }
 
-      var blockName = "\(amount)(\(kind))"
+      var blockName = "\(amountStr)(\(kind))"
 
       if kind == ".eager" {
-        blockName = "\(amount)"
+        blockName = "\(amountStr)"
       }
 
       // Special case single child character classes for repetition nodes.
@@ -146,6 +146,20 @@ extension PrettyPrinter {
       //       One(.digit)
       //     }
       //
+      func printAtom(_ pattern: String) {
+        indent()
+        
+        if kind != ".eager" {
+          blockName.removeLast()
+          output("\(blockName), ")
+        } else {
+          output("\(blockName)(")
+        }
+        
+        output("\(pattern))")
+        terminateLine()
+      }
+      
       func printSimpleCCC(
         _ ccc: DSLTree.CustomCharacterClass
       ) {
@@ -163,23 +177,42 @@ extension PrettyPrinter {
         terminateLine()
       }
 
-      switch child {
-      case let .customCharacterClass(ccc):
-        if ccc.isSimplePrint {
-          printSimpleCCC(ccc)
-          return
-        }
-        
-        break
-      case let .convertedRegexLiteral(.customCharacterClass(ccc), _):
-        if ccc.isSimplePrint {
-          printSimpleCCC(ccc)
-          return
+      // We can only do this for Optionally, ZeroOrMore, and OneOrMore. Cannot
+      // do it right now for Repeat.
+      if amount.ast.supportsInlineComponent {
+        switch child {
+        case let .atom(a):
+          if let pattern = a._patternBase(&self), pattern.canBeWrapped {
+            printAtom(pattern.0)
+            return
+          }
+          
+          break
+        case let .customCharacterClass(ccc):
+          if ccc.isSimplePrint {
+            printSimpleCCC(ccc)
+            return
+          }
+          
+          break
+          
+        case let .convertedRegexLiteral(.atom(a), _):
+          if let pattern = a._patternBase(&self), pattern.canBeWrapped {
+            printAtom(pattern.0)
+            return
+          }
+          
+          break
+        case let .convertedRegexLiteral(.customCharacterClass(ccc), _):
+          if ccc.isSimplePrint {
+            printSimpleCCC(ccc)
+            return
+          }
+          
+          break
+        default:
+          break
         }
-        
-        break
-      default:
-        break
       }
 
       printBlock(blockName) { printer in
@@ -939,6 +972,15 @@ extension AST.Quantification.Amount {
     case let .range(n, m): return "Repeat(\(n.value)...\(m.value))"
     }
   }
+  
+  var supportsInlineComponent: Bool {
+    switch self {
+    case .zeroOrMore: return true
+    case .oneOrMore: return true
+    case .zeroOrOne: return true
+    default: return false
+    }
+  }
 }
 
 extension AST.Quantification.Kind {