 }
 
 
-// MARK: - 駒型
-
-public enum 駒型 : Int8, CustomStringConvertible {
+// MARK: - 駒種型
+
+public enum 駒種型 : Int8, CustomStringConvertible {
 	case 歩, 香, 桂, 銀, 金, 角, 飛, 王
 
-	private static let 記号表: [String: 駒型] = [
+	private static let 記号表: [String: 駒種型] = [
 		"王": .王, "飛": .飛, "角": .角, "金": .金, "銀": .銀, "桂": .桂, "香": .香, "歩": .歩,
 	]
 
 	public init?(string: String) {
-		if let piece = 駒型.記号表[string] {
+		if let piece = 駒種型.記号表[string] {
 			self = piece
 		}
 		else {

		let _ = self.scan先手後手()
		scanner.scanString("持駒:", intoString: nil)
		if !scanner.scanString("なし", intoString: nil) {
			for (key, value) in 駒型.記号表 {
				var string: NSString? = nil
				var count: Int = 1
				if scanner.scanString(key, intoString: &string) {

		}
	}

	mutating func 駒を減らす(駒: 駒種型) {
		switch (駒) {
		case .歩: self.歩 -= 1; assert(self.歩 >= 0)
		case .香: self.香 -= 1; assert(self.香 >= 0)
