Rename startOfLine/endOfLine -> caretAnchor/dollarAnchor

Author: hamishknight

Sources/_RegexParser/Regex/AST/Atom.swift

@@ -63,10 +63,10 @@ extension AST {
       case dot
 
       /// ^
-      case startOfLine
+      case caretAnchor
 
       /// $
-      case endOfLine
+      case dollarAnchor
 
       // References
       case backreference(Reference)
@@ -105,8 +105,8 @@ extension AST.Atom {
     case .backtrackingDirective(let v): return v
     case .changeMatchingOptions(let v): return v
     case .dot:                          return nil
-    case .startOfLine:                  return nil
-    case .endOfLine:                    return nil
+    case .caretAnchor:                  return nil
+    case .dollarAnchor:                 return nil
     case .invalid:                      return nil
     }
   }
@@ -536,10 +536,10 @@ extension AST.Atom {
     case notTextSegment = #"\Y"#
 
     /// ^
-    case startOfLine = #"^"#
+    case caretAnchor = #"^"#
 
     /// $
-    case endOfLine = #"$"#
+    case dollarAnchor = #"$"#
 
     /// \b (from outside a custom character class)
     case wordBoundary = #"\b"#
@@ -551,8 +551,8 @@ extension AST.Atom {
 
   public var assertionKind: AssertionKind? {
     switch kind {
-    case .startOfLine:     return .startOfLine
-    case .endOfLine:       return .endOfLine
+    case .caretAnchor:  return .caretAnchor
+    case .dollarAnchor: return .dollarAnchor
 
     case .escaped(.wordBoundary):    return .wordBoundary
     case .escaped(.notWordBoundary): return .notWordBoundary
@@ -806,9 +806,9 @@ extension AST.Atom {
       // the AST? Or defer for the matching engine?
       return nil
 
-    case .scalarSequence, .property, .dot, .startOfLine, .endOfLine,
-        .backreference, .subpattern, .callout, .backtrackingDirective,
-        .changeMatchingOptions, .invalid:
+    case .scalarSequence, .property, .dot, .caretAnchor,
+        .dollarAnchor, .backreference, .subpattern, .callout,
+        .backtrackingDirective, .changeMatchingOptions, .invalid:
       return nil
     }
   }
@@ -858,7 +858,7 @@ extension AST.Atom {
     case .keyboardMetaControl(let x):
       return "\\M-\\C-\(x)"
 
-    case .property, .escaped, .dot, .startOfLine, .endOfLine,
+    case .property, .escaped, .dot, .caretAnchor, .dollarAnchor,
         .backreference, .subpattern, .namedCharacter, .callout,
         .backtrackingDirective, .changeMatchingOptions, .invalid:
       return nil
@@ -874,7 +874,7 @@ extension AST.Atom {
     // TODO: Are callouts quantifiable?
     case .escaped(let esc):
       return esc.isQuantifiable
-    case .startOfLine, .endOfLine:
+    case .caretAnchor, .dollarAnchor:
       return false
     default:
       return true

Sources/_RegexParser/Regex/Parse/LexicalAnalysis.swift

@@ -2074,8 +2074,8 @@ extension Parser {
 
       // (sometimes) special metacharacters
       case ".": return customCC ? .char(".") : .dot
-      case "^": return customCC ? .char("^") : .startOfLine
-      case "$": return customCC ? .char("$") : .endOfLine
+      case "^": return customCC ? .char("^") : .caretAnchor
+      case "$": return customCC ? .char("$") : .dollarAnchor
 
       // Escaped
       case "\\": return p.expectEscaped().value

Sources/_RegexParser/Regex/Parse/Sema.swift

@@ -288,7 +288,7 @@ extension RegexValidator {
               at: atom.location)
       }
 
-    case .char, .scalar, .startOfLine, .endOfLine, .dot:
+    case .char, .scalar, .caretAnchor, .dollarAnchor, .dot:
       break
 
     case .invalid:

Sources/_RegexParser/Regex/Printing/DumpAST.swift

@@ -153,9 +153,9 @@ extension AST.Atom {
     case .keyboardControl, .keyboardMeta, .keyboardMetaControl:
       fatalError("TODO")
 
-    case .dot:         return "."
-    case .startOfLine: return "^"
-    case .endOfLine:   return "$"
+    case .dot:          return "."
+    case .caretAnchor:  return "^"
+    case .dollarAnchor: return "$"
 
     case .backreference(let r), .subpattern(let r):
       return "\(r._dumpBase)"

Sources/_StringProcessing/ByteCodeGen.swift

@@ -202,7 +202,7 @@ fileprivate extension Compiler.ByteCodeGen {
         !input.isOnGraphemeClusterBoundary(pos)
       }
 
-    case .startOfLine:
+    case .caretAnchor:
       // FIXME: Anchor.startOfLine must always use this first branch
       // The behavior of `^` should depend on `anchorsMatchNewlines`, but
       // the DSL-based `.startOfLine` anchor should always match the start
@@ -224,7 +224,7 @@ fileprivate extension Compiler.ByteCodeGen {
         }
       }
 
-    case .endOfLine:
+    case .dollarAnchor:
       // FIXME: Anchor.endOfLine must always use this first branch
       // The behavior of `$` should depend on `anchorsMatchNewlines`, but
       // the DSL-based `.endOfLine` anchor should always match the end

Sources/_StringProcessing/ConsumerInterface.swift

@@ -293,7 +293,7 @@ extension AST.Atom {
         "Should have been handled by tree conversion")
       fatalError(".atom(.dot) is handled in emitDot")
 
-    case .startOfLine, .endOfLine:
+    case .caretAnchor, .dollarAnchor:
       // handled in emitAssertion
       return nil
 

Sources/_StringProcessing/PrintAsPattern.swift

@@ -651,9 +651,11 @@ extension AST.Atom.AssertionKind {
   // TODO: Some way to integrate this with conversion...
   var _patternBase: String {
     switch self {
-    case .startOfLine:
+    case .caretAnchor:
+      // FIXME: The DSL doesn't have a way of representing this.
       return "Anchor.startOfLine"
-    case .endOfLine:
+    case .dollarAnchor:
+      // FIXME: The DSL doesn't have a way of representing this.
       return "Anchor.endOfLine"
     case .wordBoundary:
       return "Anchor.wordBoundary"
@@ -923,7 +925,7 @@ extension AST.Atom {
       // The DSL does not have an equivalent to '.', print as a regex.
       return ("/./", false)
 
-    case .startOfLine, .endOfLine:
+    case .caretAnchor, .dollarAnchor:
       fatalError("unreachable")
 
     case .backreference:
@@ -978,7 +980,7 @@ extension AST.Atom {
     case .dot:
       return "."
 
-    case .startOfLine, .endOfLine:
+    case .caretAnchor, .dollarAnchor:
       fatalError("unreachable")
 
     case .backreference:

Sources/_StringProcessing/Regex/DSLTree.swift

@@ -721,10 +721,10 @@ extension DSLTree {
           : .init(ast: .textSegment)
       }
       public static func startOfLine(_ inverted: Bool = false) -> Self {
-        .init(ast: .startOfLine)
+        .init(ast: .caretAnchor)
       }
       public static func endOfLine(_ inverted: Bool = false) -> Self {
-        .init(ast: .endOfLine)
+        .init(ast: .dollarAnchor)
       }
       public static func wordBoundary(_ inverted: Bool = false) -> Self {
         inverted