feat: compare 함수 내 excute 함수 제거, gameEnd 파일 삭제

yagom-academy · Jan 4, 2024 · 2e8b49c · 2e8b49c
1 parent 9efef7d
commit 2e8b49c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 35 deletions.
diff --git a/NumberBaseball/NumberBaseball.xcodeproj/project.pbxproj b/NumberBaseball/NumberBaseball.xcodeproj/project.pbxproj
@@ -11,7 +11,6 @@
 		2E66896B2B464B1A009123FF /* UserInputNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E66896A2B464B1A009123FF /* UserInputNumber.swift */; };
 		2E66896D2B464B88009123FF /* CheckStrikeAndBall.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E66896C2B464B88009123FF /* CheckStrikeAndBall.swift */; };
 		2E66896F2B464C1B009123FF /* GameStart.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E66896E2B464C1B009123FF /* GameStart.swift */; };
-		2E6689712B464C25009123FF /* GameEnd.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E6689702B464C25009123FF /* GameEnd.swift */; };
 		2E6689732B464FC4009123FF /* ExcuteGame.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2E6689722B464FC4009123FF /* ExcuteGame.swift */; };
 		C7A29CFC2551372B00CAC77A /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = C7A29CFB2551372B00CAC77A /* main.swift */; };
 /* End PBXBuildFile section */
@@ -33,7 +32,6 @@
 		2E66896A2B464B1A009123FF /* UserInputNumber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserInputNumber.swift; sourceTree = "<group>"; };
 		2E66896C2B464B88009123FF /* CheckStrikeAndBall.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CheckStrikeAndBall.swift; sourceTree = "<group>"; };
 		2E66896E2B464C1B009123FF /* GameStart.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameStart.swift; sourceTree = "<group>"; };
-		2E6689702B464C25009123FF /* GameEnd.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GameEnd.swift; sourceTree = "<group>"; };
 		2E6689722B464FC4009123FF /* ExcuteGame.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExcuteGame.swift; sourceTree = "<group>"; };
 		8BA1F3BF2B46562C00D80796 /* FlowChar_Baseball.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = FlowChar_Baseball.png; sourceTree = "<group>"; };
 		C7A29CF82551372B00CAC77A /* NumberBaseball */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = NumberBaseball; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -73,7 +71,6 @@
 				C7A29CFB2551372B00CAC77A /* main.swift */,
 				2E6689722B464FC4009123FF /* ExcuteGame.swift */,
 				2E66896E2B464C1B009123FF /* GameStart.swift */,
-				2E6689702B464C25009123FF /* GameEnd.swift */,
 				2E6689682B464B00009123FF /* GenerateNumber.swift */,
 				2E66896A2B464B1A009123FF /* UserInputNumber.swift */,
 				2E66896C2B464B88009123FF /* CheckStrikeAndBall.swift */,
@@ -145,7 +142,6 @@
 				2E66896D2B464B88009123FF /* CheckStrikeAndBall.swift in Sources */,
 				2E6689732B464FC4009123FF /* ExcuteGame.swift in Sources */,
 				2E66896F2B464C1B009123FF /* GameStart.swift in Sources */,
-				2E6689712B464C25009123FF /* GameEnd.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/NumberBaseball/NumberBaseball/CheckStrikeAndBall.swift b/NumberBaseball/NumberBaseball/CheckStrikeAndBall.swift
@@ -9,14 +9,9 @@ import Foundation
 
 extension NumberBaseBall {
     func compare(){
-
-        var strike: Int = 0
-        var ball: Int = 0
-
         while repeatTime > 0 {
-
-            strike = checkStrike()
-            ball = checkIfBall()
+            let strike = checkStrike()
+            let ball = checkIfBall()
 
             print("\(strike) 스트라이크, \(ball) 볼")
 
@@ -25,6 +20,7 @@ extension NumberBaseBall {
                 repeatTime = 9
                 break
             }
+
             repeatTime -= 1
             print("남은 기회는 \(repeatTime)")
 
@@ -35,11 +31,7 @@ extension NumberBaseBall {
             }
 
             userInputNumber()
-
         }
-
-        execute()
-
     }
 
     func checkStrike () -> Int {
@@ -66,6 +58,5 @@ extension NumberBaseBall {
         }
         return numberOfBall
     }
-
 }
 
diff --git a/NumberBaseball/NumberBaseball/ExcuteGame.swift b/NumberBaseball/NumberBaseball/ExcuteGame.swift
@@ -14,16 +14,15 @@ extension NumberBaseBall {
     }
 
     func execute() {
-
         var flag: Bool = true
 
-        repeat {
+        while flag {
             print("1. 게임시작")
             print("2. 게임종료")
             print("원하는 기능을 선택해주세요: ", terminator: "")
 
             guard let input = readLine(), !input.isEmpty else {
-                //execute()
+                print("입력이 잘못 되었습니다.")
                 continue
             }
 
@@ -35,11 +34,8 @@ extension NumberBaseBall {
             case .start:
                 gameStart()
             case .end:
-                //gameEnd()
                 flag = false
-                print("")
             }
-        } while (flag)
-
+        }
     }
 }
diff --git a/NumberBaseball/NumberBaseball/GameStart.swift b/NumberBaseball/NumberBaseball/GameStart.swift
@@ -9,11 +9,8 @@ import Foundation
 
 extension NumberBaseBall {
     func gameStart(){
-
         generateNumber()
         userInputNumber()
-
-
     }
 }
 
diff --git a/NumberBaseball/NumberBaseball/GenerateNumber.swift b/NumberBaseball/NumberBaseball/GenerateNumber.swift
@@ -12,9 +12,9 @@ extension NumberBaseBall {
         comNumList = []
 
         while comNumList.count < 3 {
-            var randomNum = Int.random(in: 1...9)
+            let randomNum = Int.random(in: 1...9)
 
-            var randomNumStr = String(randomNum)
+            let randomNumStr = String(randomNum)
 
             if !comNumList.contains(randomNumStr) {
                 comNumList.append(randomNumStr)
@@ -23,8 +23,6 @@ extension NumberBaseBall {
         }
 
         print(comNumList)
-
     }
-
 }
 
diff --git a/NumberBaseball/NumberBaseball/UserInputNumber.swift b/NumberBaseball/NumberBaseball/UserInputNumber.swift
@@ -14,21 +14,18 @@ extension NumberBaseBall {
         var flag: Bool = true
 
         while flag {
-
             guard let randomNum = readLine() else {
                 return
             }
 
-            var splitUserInput = randomNum.components(separatedBy: " ")
+            let splitUserInput = randomNum.components(separatedBy: " ")
 
             if splitUserInput[0] != splitUserInput[1] && splitUserInput[0] != splitUserInput[2] && splitUserInput[1] != splitUserInput[2] {
                 flag = false
                 userNumList = splitUserInput
             }
         }
-
         compare()
-
     }
 }
 

diff --git a/NumberBaseball/NumberBaseball/main.swift b/NumberBaseball/NumberBaseball/main.swift
@@ -15,7 +15,6 @@ class NumberBaseBall {
         self.comNumList = comNumList
         self.userNumList = userNumList
     }
-
 }
 
 let numberBaseball = NumberBaseBall(comNumList: [], userNumList: [])
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ class NumberBaseBall { @@
             self.comNumList = comNumList
             self.userNumList = userNumList
         }
     }
     let numberBaseball = NumberBaseBall(comNumList: [], userNumList: [])
@@ Expand Down @@