Handle refactoring changeMatchingOptions

Author: Azoy

Sources/_RegexParser/Regex/Printing/PrettyPrinter.swift

@@ -43,6 +43,9 @@ public struct PrettyPrinter {
 
   // The current default quantification behavior
   public var quantificationBehavior: AST.Quantification.Kind = .eager
+
+  // A stack of the current added inline matching options, e.g. (?s)
+  public var inlineMatchingOptions: [[AST.MatchingOption]] = []
 }
 
 // MARK: - Raw interface
@@ -142,4 +145,18 @@ extension PrettyPrinter {
     printIndented(f)
     print(endDelimiter)
   }
+
+  /// Pushes the list of matching options to the current stack of other matching
+  /// options and increases the indentation level by 1.
+  public mutating func pushMatchingOptions(_ options: [AST.MatchingOption]) {
+    indentLevel += 1
+    inlineMatchingOptions.append(options)
+  }
+
+  /// Pops the most recent list of matching options from the printer and
+  /// decreases the indentation level by 1.
+  public mutating func popMatchingOptions() -> [AST.MatchingOption] {
+    indentLevel -= 1
+    return inlineMatchingOptions.removeLast()
+  }
 }

Sources/_StringProcessing/PrintAsPattern.swift

@@ -74,6 +74,51 @@ extension PrettyPrinter {
     printBlock("Regex") { printer in
       printer.printAsPattern(convertedFromAST: node, isTopLevel: true)
     }
+
+    printInlineMatchingOptions()
+  }
+
+  mutating func printInlineMatchingOptions() {
+    for matchingOptions in inlineMatchingOptions {
+      let options = popMatchingOptions()
+
+      printIndented { printer in
+        for option in options {
+          switch option.kind {
+          case .asciiOnlyDigit:
+            printer.print(".asciiOnlyDigits()")
+
+          case .asciiOnlyPOSIXProps:
+            printer.print(".asciiOnlyCharacterClasses()")
+
+          case .asciiOnlySpace:
+            printer.print(".asciiOnlyWhitespace()")
+
+          case .asciiOnlyWord:
+            printer.print(".asciiOnlyWordCharacters()")
+
+          case .caseInsensitive:
+            printer.print(".ignoresCase()")
+
+          case .multiline:
+            printer.print(".anchorsMatchLineEndings()")
+
+          case .reluctantByDefault:
+            // This is handled by altering every OneOrMore, etc by changing each
+            // individual repetition behavior instead of creating a nested regex.
+            continue
+
+          case .singleLine:
+            printer.print(".dotMatchesNewlines()")
+
+          default:
+            break
+          }
+        }
+      }
+
+      print("}")
+    }
   }
 
   // FIXME: Use of back-offs like height and depth
@@ -424,7 +469,7 @@ extension PrettyPrinter {
     // Also in the same vein, if we have a few atom members but no
     // nonAtomMembers, then we can emit a single .anyOf(...) for them.
     if !charMembers.isEmpty, nonCharMembers.isEmpty {
-      let anyOf = ".anyOf(\(charMembers))"
+      let anyOf = "CharacterClass.anyOf(\(charMembers))"
 
       indent()
 
@@ -502,15 +547,15 @@ extension PrettyPrinter {
         if wrap {
           output("One(.anyOf(\(String(c)._quoted)))")
         } else {
-          output(".anyOf(\(String(c)._quoted))")
+          output("CharacterClass.anyOf(\(String(c)._quoted))")
         }
 
       case let .scalar(s):
 
         if wrap {
           output("One(.anyOf(\(s._dslBase._bareQuoted)))")
         } else {
-          output(".anyOf(\(s._dslBase._bareQuoted))")
+          output("CharacterClass.anyOf(\(s._dslBase._bareQuoted))")
         }
 
       case let .unconverted(a):
@@ -538,7 +583,7 @@ extension PrettyPrinter {
       if wrap {
         output("One(.anyOf(\(s._quoted)))")
       } else {
-        output(".anyOf(\(s._quoted))")
+        output("CharacterClass.anyOf(\(s._quoted))")
       }
 
     case .trivia(_):
@@ -1285,10 +1330,20 @@ extension DSLTree.Atom {
         switch add.kind {
         case .reluctantByDefault:
           printer.quantificationBehavior = .reluctant
+
+          // Don't create a nested Regex for (?U), we handle this by altering
+          // every individual repetitionBehavior for things like OneOrMore.
+          if matchingOptions.ast.adding.count == 1 {
+            return nil
+          }
+
         default:
           break
         }
       }
+
+      printer.print("Regex {")
+      printer.pushMatchingOptions(matchingOptions.ast.adding)
     }
 
     return nil