review accepted

JCSooHwanCho · JCSooHwanCho · commit 927754255b86 · 2019-11-11T20:36:43.000+09:00
diff --git a/Sources/Regex/AGMatchList.swift b/Sources/Regex/AGMatchList.swift
@@ -15,7 +15,7 @@ public struct AGMatchList: Sequence, Equatable {
     public let baseString: String
     private let list: [Element]
 
-    init(withBase base: String, matching matchList: [Element]) {
+    init(base: String, matching matchList: [Element]) {
         baseString = base
         list = matchList
     }
diff --git a/Sources/Regex/AGRegex.swift b/Sources/Regex/AGRegex.swift
@@ -19,11 +19,12 @@ public class AGRegex {
 
 extension AGRegex {
     
-    public func getMatchList(_ str: String) -> AGMatchList {
+    public func matchAll(_ str: String,
+                         options: NSRegularExpression.MatchingOptions = [] ) -> AGMatchList {
 
         let matched = regex.matches(
                         in: str,
-                        options: [],
+                        options: options,
                         range: NSRange(location: 0, length: str.count))
 
         let mapped: [AGMatch] = matched.map {
@@ -37,7 +38,7 @@ extension AGRegex {
                      base: str, groups: group)
         }
 
-        return AGMatchList(withBase: str, matching: mapped)
+        return AGMatchList(base: str, matching: mapped)
     }
 
     public func sub(str: String, replace: String, count: Int = Int.max) -> String {
diff --git a/Tests/AGRegexTest.swift b/Tests/AGRegexTest.swift
@@ -16,8 +16,8 @@ class AGRegexTest: XCTestCase {
         let r = try! NSRegularExpression(pattern: "ai", options: [])
         let regex = AGRegex(r)
         let str = "The rain in Spain"
-        let actual = regex.getMatchList(str)
-        let expect = AGMatchList(withBase: str, matching:  [
+        let actual = regex.matchAll(str)
+        let expect = AGMatchList(base: str, matching:  [
                    AGMatch(start: 5, end: 7, base: str, groups: ["ai"]),
                    AGMatch(start: 14, end: 16, base: str, groups: ["ai"]),
                ])
@@ -29,7 +29,7 @@ class AGRegexTest: XCTestCase {
         let r = try! NSRegularExpression(pattern: "ai", options: [])
         let regex = AGRegex(r)
         let str = "The rain in Spain"
-        let actual = regex.getMatchList(str).first
+        let actual = regex.matchAll(str).first
         let expect = AGMatch(start: 5, end: 7, base: str, groups: ["ai"])
         XCTAssertEqual(actual, expect)
     }
@@ -38,7 +38,7 @@ class AGRegexTest: XCTestCase {
         let r = try! NSRegularExpression(pattern: "ai", options: [])
         let regex = AGRegex(r)
         let str = "The rain in Spain"
-        let actual = regex.getMatchList(str).last
+        let actual = regex.matchAll(str).last
         let expect = AGMatch(start: 14, end: 16, base: str, groups: ["ai"])
         XCTAssertEqual(actual, expect)
     }
@@ -75,7 +75,7 @@ class AGRegexTest: XCTestCase {
         ]
         
         var testCount = 0
-        for (i, m) in regex.getMatchList(str).enumerated() {
+        for (i, m) in regex.matchAll(str).enumerated() {
             let actual = "\(m.group(2)) * \(m.group(1))"
             let expect = expects[i]
             XCTAssertEqual(actual, expect)

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public struct AGMatchList: Sequence, Equatable {`
`15`	`15`	`public let baseString: String`
`16`	`16`	`private let list: [Element]`
`17`	`17`
`18`		`- init(withBase base: String, matching matchList: [Element]) {`
	`18`	`+ init(base: String, matching matchList: [Element]) {`
`19`	`19`	`baseString = base`
`20`	`20`	`list = matchList`
`21`	`21`	`}`