Merge remote-tracking branch 'origin/lazyIter' into lazyIter

JCSooHwanCho · JCSooHwanCho · commit af6b86dab92a · 2019-11-12T12:08:05.000+09:00
diff --git a/Sources/Regex/AGMatchLazyList.swift b/Sources/Regex/AGMatchLazyList.swift
@@ -14,14 +14,14 @@ public struct AGMatchLazyList: Equatable, Sequence {
 
     public let baseString: String
     private let regex: NSRegularExpression
-
-    init(withBase base: String, regex: NSRegularExpression) {
+    
+    init(base: String, regex: NSRegularExpression) {
         self.baseString = base
         self.regex = regex
     }
 
     public __consuming func makeIterator() -> AGMatchLazyList.Iterator {
-        return AGMatchLazyListIterator(withBase: baseString,
+        return AGMatchLazyListIterator(base: baseString,
                                        regex: self.regex)
     }
 }
diff --git a/Sources/Regex/AGMatchLazyListIterator.swift b/Sources/Regex/AGMatchLazyListIterator.swift
@@ -43,7 +43,7 @@ public struct AGMatchLazyListIterator: IteratorProtocol {
         return result
     }
 
-    init(withBase base: String, regex: NSRegularExpression) {
+    init(base: String, regex: NSRegularExpression) {
         self.baseString = base
         self.regex = regex
     }
diff --git a/Sources/Regex/AGRegex.swift b/Sources/Regex/AGRegex.swift
@@ -9,7 +9,7 @@
 @_exported import Foundation
 
 public class AGRegex {
-
+    
     private var regex: NSRegularExpression
 
     public init(_ regex: NSRegularExpression) {
@@ -19,9 +19,9 @@ public class AGRegex {
 
 extension AGRegex {
     
-    public func matchAll(_ str: String,
-                         options: NSRegularExpression.MatchingOptions = [])
-                            -> AGMatchList {
+    public func makeMatchList(_ str: String,
+                              options: NSRegularExpression.MatchingOptions = [])
+                                -> AGMatchList {
         let matched = regex.matches(
                         in: str,
                         options: options,
@@ -59,9 +59,9 @@ extension AGRegex {
         return result
     }
 
-    public func matchAllLazliy (_ str: String,
+    public func makeMatchStream(_ str: String,
                                 option: NSRegularExpression.MatchingOptions = [])
-                            -> AGMatchLazyList {
-        return AGMatchLazyList(withBase: str, regex: self.regex)
+                                -> AGMatchLazyList {
+        return AGMatchLazyList(base: str, regex: self.regex)
     }
 }
diff --git a/Tests/AGRegexTest.swift b/Tests/AGRegexTest.swift
@@ -16,7 +16,7 @@ class AGRegexTest: XCTestCase {
         let r = try! NSRegularExpression(pattern: "ai", options: [])
         let regex = AGRegex(r)
         let str = "The rain in Spain"
-        let actual = regex.matchAll(str)
+        let actual = regex.makeMatchList(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.matchAll(str).first
+        let actual = regex.makeMatchList(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.matchAll(str).last
+        let actual = regex.makeMatchList(str).last
         let expect = AGMatch(start: 14, end: 16, base: str, groups: ["ai"])
         XCTAssertEqual(actual, expect)
     }
@@ -76,7 +76,7 @@ class AGRegexTest: XCTestCase {
 
         var actuals: [String] = []
 
-        for m in regex.matchAllLazliy(str) {
+        for m in regex.makeMatchStream(str) {
             let actual = "\(m.group(2)) * \(m.group(1))"
             actuals.append(actual)
         }

Original file line number	Diff line number	Diff line change
`@@ -14,14 +14,14 @@ public struct AGMatchLazyList: Equatable, Sequence {`
`14`	`14`
`15`	`15`	`public let baseString: String`
`16`	`16`	`private let regex: NSRegularExpression`
`17`		`-`
`18`		`- init(withBase base: String, regex: NSRegularExpression) {`
	`17`	`+`
	`18`	`+ init(base: String, regex: NSRegularExpression) {`
`19`	`19`	`self.baseString = base`
`20`	`20`	`self.regex = regex`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public __consuming func makeIterator() -> AGMatchLazyList.Iterator {`
`24`		`- return AGMatchLazyListIterator(withBase: baseString,`
	`24`	`+ return AGMatchLazyListIterator(base: baseString,`
`25`	`25`	`regex: self.regex)`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public struct AGMatchLazyListIterator: IteratorProtocol {`
`43`	`43`	`return result`
`44`	`44`	`}`
`45`	`45`
`46`		`- init(withBase base: String, regex: NSRegularExpression) {`
	`46`	`+ init(base: String, regex: NSRegularExpression) {`
`47`	`47`	`self.baseString = base`
`48`	`48`	`self.regex = regex`
`49`	`49`	`}`