Merge pull request #90 from yaslab/legacy

Mark `CSV` as deprecated

Author: yaslab

CSV.xcodeproj/project.pbxproj

@@ -35,10 +35,10 @@
 		0E959C67208B611F005F8D01 /* CSVWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5C208B611F005F8D01 /* CSVWriter.swift */; };
 		0E959C68208B611F005F8D01 /* CSVWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5C208B611F005F8D01 /* CSVWriter.swift */; };
 		0E959C69208B611F005F8D01 /* CSVWriter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5C208B611F005F8D01 /* CSVWriter.swift */; };
-		0E959C6A208B611F005F8D01 /* CSV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5D208B611F005F8D01 /* CSV.swift */; };
-		0E959C6B208B611F005F8D01 /* CSV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5D208B611F005F8D01 /* CSV.swift */; };
-		0E959C6C208B611F005F8D01 /* CSV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5D208B611F005F8D01 /* CSV.swift */; };
-		0E959C6D208B611F005F8D01 /* CSV.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5D208B611F005F8D01 /* CSV.swift */; };
+		0E959C6A208B611F005F8D01 /* Legacy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5D208B611F005F8D01 /* Legacy.swift */; };
+		0E959C6B208B611F005F8D01 /* Legacy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5D208B611F005F8D01 /* Legacy.swift */; };
+		0E959C6C208B611F005F8D01 /* Legacy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5D208B611F005F8D01 /* Legacy.swift */; };
+		0E959C6D208B611F005F8D01 /* Legacy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5D208B611F005F8D01 /* Legacy.swift */; };
 		0E959C6E208B611F005F8D01 /* BinaryReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5E208B611F005F8D01 /* BinaryReader.swift */; };
 		0E959C6F208B611F005F8D01 /* BinaryReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5E208B611F005F8D01 /* BinaryReader.swift */; };
 		0E959C70208B611F005F8D01 /* BinaryReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0E959C5E208B611F005F8D01 /* BinaryReader.swift */; };
@@ -116,7 +116,7 @@
 		0E87607E219FF43B00C6C7FA /* CSVRowDecoder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CSVRowDecoder.swift; sourceTree = "<group>"; };
 		0E959C5B208B611F005F8D01 /* CSVError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSVError.swift; sourceTree = "<group>"; };
 		0E959C5C208B611F005F8D01 /* CSVWriter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSVWriter.swift; sourceTree = "<group>"; };
-		0E959C5D208B611F005F8D01 /* CSV.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CSV.swift; sourceTree = "<group>"; };
+		0E959C5D208B611F005F8D01 /* Legacy.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Legacy.swift; sourceTree = "<group>"; };
 		0E959C5E208B611F005F8D01 /* BinaryReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BinaryReader.swift; sourceTree = "<group>"; };
 		0E959C5F208B611F005F8D01 /* UnicodeIterator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UnicodeIterator.swift; sourceTree = "<group>"; };
 		0E959C60208B611F005F8D01 /* Endian.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Endian.swift; sourceTree = "<group>"; };
@@ -232,7 +232,7 @@
 			isa = PBXGroup;
 			children = (
 				0E959C5E208B611F005F8D01 /* BinaryReader.swift */,
-				0E959C5D208B611F005F8D01 /* CSV.swift */,
+				0E959C5D208B611F005F8D01 /* Legacy.swift */,
 				0E959C5B208B611F005F8D01 /* CSVError.swift */,
 				0E959C61208B611F005F8D01 /* CSVReader.swift */,
 				0E87607E219FF43B00C6C7FA /* CSVRowDecoder.swift */,
@@ -568,7 +568,7 @@
 				0E959C77208B611F005F8D01 /* Endian.swift in Sources */,
 				0E959C67208B611F005F8D01 /* CSVWriter.swift in Sources */,
 				0E959C73208B611F005F8D01 /* UnicodeIterator.swift in Sources */,
-				0E959C6B208B611F005F8D01 /* CSV.swift in Sources */,
+				0E959C6B208B611F005F8D01 /* Legacy.swift in Sources */,
 				0E959C7B208B611F005F8D01 /* CSVReader.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -599,7 +599,7 @@
 				0E959C79208B611F005F8D01 /* Endian.swift in Sources */,
 				0E959C69208B611F005F8D01 /* CSVWriter.swift in Sources */,
 				0E959C75208B611F005F8D01 /* UnicodeIterator.swift in Sources */,
-				0E959C6D208B611F005F8D01 /* CSV.swift in Sources */,
+				0E959C6D208B611F005F8D01 /* Legacy.swift in Sources */,
 				0E959C7D208B611F005F8D01 /* CSVReader.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -614,7 +614,7 @@
 				0E959C76208B611F005F8D01 /* Endian.swift in Sources */,
 				0E959C66208B611F005F8D01 /* CSVWriter.swift in Sources */,
 				0E959C72208B611F005F8D01 /* UnicodeIterator.swift in Sources */,
-				0E959C6A208B611F005F8D01 /* CSV.swift in Sources */,
+				0E959C6A208B611F005F8D01 /* Legacy.swift in Sources */,
 				0E959C7A208B611F005F8D01 /* CSVReader.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -645,7 +645,7 @@
 				0E959C78208B611F005F8D01 /* Endian.swift in Sources */,
 				0E959C68208B611F005F8D01 /* CSVWriter.swift in Sources */,
 				0E959C74208B611F005F8D01 /* UnicodeIterator.swift in Sources */,
-				0E959C6C208B611F005F8D01 /* CSV.swift in Sources */,
+				0E959C6C208B611F005F8D01 /* Legacy.swift in Sources */,
 				0E959C7C208B611F005F8D01 /* CSVReader.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Sources/CSV/CSV.swift Sources/CSV/Legacy.swiftSources/CSV/CSV.swift renamed to Sources/CSV/Legacy.swift

@@ -1,11 +1,12 @@
 //
-//  CSV.swift
+//  Legacy.swift
 //  CSV
 //
 //  Created by Yasuhiro Hatta on 2016/06/11.
 //  Copyright © 2016 yaslab. All rights reserved.
 //
 
+@available(*, deprecated, renamed: "CSVReader")
 public typealias CSV = CSVReader
 
 extension CSV: Sequence { }

Sources/CSV/UnicodeIterator.swift

@@ -8,8 +8,7 @@
 
 internal class UnicodeIterator<
     Input: IteratorProtocol,
-    InputEncoding: UnicodeCodec>
-    : IteratorProtocol
+    InputEncoding: UnicodeCodec>: IteratorProtocol
     where InputEncoding.CodeUnit == Input.Element {
 
     private var input: Input