ManualTicTacToe: Misc. little: fixed misspellings, edited comments, etc.

Author: Daniel Barclay

src/main/scala/com/us/dsb/explore/algs/ttt/manual/game/Board.scala

@@ -55,7 +55,7 @@ private[game] class Board(private val cellStates: Vector[Cell]) {
 
   // ?? Q: How to use Tuple3 in data and then convert to or use as 3-element
   //   List and call .forall?
-  // ?? any way auto-generate this simply?  or factor out repeated cell pairs?
+  // ?? any way auto-generate this _simply_?  or factor out repeated cell pairs?
   private type CellRawIndices = (Int, Int)
   private val linesData: List[(CellRawIndices, CellRawIndices, CellRawIndices)] =
         List(

src/main/scala/com/us/dsb/explore/algs/ttt/manual/game/GameState.scala

@@ -19,14 +19,15 @@ object GameState {
     GameState(Board.initial, None, startingPlayer)
   def initial: GameState = initial(Player.X)
 }
+import GameState._
 
 /**
  * TTT game state _and_ controller--should functions be separated or together?
  *
  * @param gameResult  `None` means no win or draw yet
  */
 case class GameState(board: Board,
-                     gameResult: Option[GameState.GameResult],
+                     gameResult: Option[GameResult],
                      currentPlayer: Player
                     ) {
 
@@ -43,10 +44,10 @@ case class GameState(board: Board,
         val markedBoard = board.withCellMarkedForPlayer(row, column, currentPlayer)
         val newGameResult =
           if (markedBoard.hasThreeInARow) {
-            GameState.GameResult.Win(currentPlayer).some
+            GameResult.Win(currentPlayer).some
           }
           else if (markedBoard.hasNoMovesLeft) {
-            GameState.GameResult.Draw.some
+            GameResult.Draw.some
           }
           else {
             gameResult

src/main/scala/com/us/dsb/explore/algs/ttt/manual/ui/GameUI.scala

@@ -11,7 +11,7 @@ import scala.util.chaining.scalaUtilChainingOps
 /** TTT UI controller. */
 object GameUI {
 
-  // ??? enhance; maybe just put clean strings in; maybe build on GameResult (plus quit case)
+  // ?? enhance; maybe just put clean strings in; maybe build on GameResult (plus quit case)
   case class GameUIResult(text: String)
 
 
@@ -35,8 +35,6 @@ object GameUI {
   // (Could put strings in enumerators and use Enum.withName to factor down
   // parse function, but then layers wouldn't be separated.)
 
-  // ?? revisit String (but may be fine since dealing with input _strings_
-  //   from _user_
   // ?? revisit Either--use something fancier (MonadError)?
   private def parseCommand(rawCmd: String): Either[String, UICommand] = {
     import UICommand._
@@ -88,7 +86,7 @@ object GameUI {
         uiState.copy(gameState = newGameState)
       case Left(errorMsg) =>
         // ??? probably change return value to carry state plus any message
-        // (or possibly Either, with caller displaying)
+        //   (or possibly Either, with caller displaying)
         io.printError(errorMsg)
         uiState  // no change
     }
@@ -124,7 +122,7 @@ object GameUI {
           case None => // game not done yet (after valid _or_ invalid mark try)
             newState.asRight
           case Some(gameResult) =>
-            import GameState.GameResult._ // ??? unnest? leave?
+            import GameState.GameResult._
             val resultText =
               gameResult match {
                 case Draw => "Game ended in draw"
@@ -159,7 +157,7 @@ object GameUI {
     }
   }
 
-  // ???? soon, probably create class GameUI to hold NameThisIO (to avoid passing
+  // ??? soon, probably create class GameUI to hold NameThisIO (to avoid passing
   //   all around); but think about currently pure methods vs. using IO member)
 
   // ??? add more GameUI tests: