lint/style changes

include/GameBoard.h

@@ -22,7 +22,9 @@ public:
   bool takeTilesFromPool(azool::TileColor color, int& numTiles, bool& poolPenalty);
   void returnTilesToBag(int numTiles, azool::TileColor color);
   void dealTiles();
-  int numFactories() { return tileFactories.size(); }
+  int numFactories() {
+    return tileFactories.size();
+  }
   bool endOfRound() {
     // round ends when the pool and tile factories are empty
     for (int ii = 0; ii < azool::NUMCOLORS; ++ii) {

include/Player.h

@@ -15,10 +15,16 @@ public:
   void placeTiles(int rowIdx, azool::TileColor color, int numTiles);
   void endRound(bool& fullRow);
   void finalizeScore();
-  int getScore() const { return myScore; }
+  int getScore() const {
+    return myScore;
+  }
   std::string printMyBoard() const;
-  bool tookPenalty() const { return myTookPoolPenaltyThisRound; }
+  bool tookPenalty() const {
-  const std::string getPlayerName() const { return myName; }
+    return myTookPoolPenaltyThisRound;
+  }
+  const std::string getPlayerName() const {
+    return myName;
+  }
 
 private:
   Player(const Player&) = delete;

include/tile_utils.h

@@ -1,7 +1,7 @@
 #ifndef TILE_UTILS_H_
 #define TILE_UTILS_H_
 namespace azool {
-  enum TileColor {
+enum TileColor {
   NONE = -1,
   RED = 0,
   BLUE,
@@ -9,15 +9,15 @@ namespace azool {
   YELLOW,
   BLACK,
   NUMCOLORS
-  };
+};
-  const std::string TileColorStrings[NUMCOLORS] =  {
+const std::string TileColorStrings[NUMCOLORS] =  {
   "red",
   "blue",
   "green",
   "yellow",
   "black"
-  };
+};
 
-  const char TileColorSyms[NUMCOLORS] = { 'r', 'b', 'g', 'y', 'k' };
+const char TileColorSyms[NUMCOLORS] = { 'r', 'b', 'g', 'y', 'k' };
 }
 #endif  // TILE_UTILS_H_

src/GameBoard.cc

@@ -12,7 +12,7 @@ GameBoard::GameBoard(int numPlayers) :
   rng(std::default_random_engine(
         std::chrono::system_clock::now().time_since_epoch().count())) {
   resetBoard();
-  }  // GameBoard::GameBoard
+}  // GameBoard::GameBoard
 
 std::ostream& operator<<(std::ostream& out, const GameBoard& board) {
   // user will input 1-indexed value, even though we 0-index internally

src/Player.cc

@@ -17,7 +17,7 @@ Player::Player(GameBoard* const board, std::string name) :
     myRows[ii].first = 0;
     myRows[ii].second = azool::NONE;
   }  // initialize rows
-  }  // Player::Player
+}  // Player::Player
 
 bool Player::checkValidMove(azool::TileColor color, int rowIdx) const {
   // check if valid move
@@ -296,7 +296,7 @@ bool Player::discardFromPool(azool::TileColor color) {
 }  // Player::discardFromPool
 
 namespace {
-  int promptForFactoryIdx(int maxNumFactories) {
+int promptForFactoryIdx(int maxNumFactories) {
   static const char* promptFactoryIdxDraw = "Which factory? enter index\n";
   char factInput;  // TODO can we safely say there will never be more than 9 possible?
   std::cout << promptFactoryIdxDraw << std::flush;
@@ -306,8 +306,8 @@ namespace {
     return -1;
   }
   return factIdx;
-  }
+}
-  azool::TileColor promptForColor() {
+azool::TileColor promptForColor() {
   static const char* promptColorDraw = "Which color? [r|b|g|y|k]\n";
   char colorInput = '\0';
   std::cout << promptColorDraw << std::flush;
@@ -332,8 +332,8 @@ namespace {
     return azool::NONE;
   }  // end switch
   return azool::NONE;
-  }
+}
-  int promptForRow() {
+int promptForRow() {
   static const char* promptRowPlacement = "Place on which row? enter number [1-5]\n";
   char rowInput;
   std::cout << promptRowPlacement << std::flush;
@@ -343,7 +343,7 @@ namespace {
     return -1;
   }
   return rowIdx;
-  }
+}
 }  // anonymous namespace
 
 void Player::takeTurn() {