[Piece] Format
This commit is contained in:
27
Piece.cpp
27
Piece.cpp
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include <ostream>
|
#include <ostream>
|
||||||
|
|
||||||
Piece::Piece(PieceColor color, PieceType type) : _color(color), _type(type) {
|
Piece::Piece(PieceColor color, PieceType type) : mColor(color), mType(type) {
|
||||||
}
|
}
|
||||||
|
|
||||||
Piece::Optional Piece::fromSymbol(char symbol) {
|
Piece::Optional Piece::fromSymbol(char symbol) {
|
||||||
@@ -12,37 +12,30 @@ Piece::Optional Piece::fromSymbol(char symbol) {
|
|||||||
auto tryType = static_cast<PieceType>(toupper(symbol));
|
auto tryType = static_cast<PieceType>(toupper(symbol));
|
||||||
|
|
||||||
switch (tryType) {
|
switch (tryType) {
|
||||||
case PieceType::Pawn:
|
case PieceType::Pawn:type = PieceType::Pawn;
|
||||||
type = PieceType::Pawn;
|
|
||||||
break;
|
break;
|
||||||
case PieceType::Knight:
|
case PieceType::Knight:type = PieceType::Knight;
|
||||||
type = PieceType::Knight;
|
|
||||||
break;
|
break;
|
||||||
case PieceType::Bishop:
|
case PieceType::Bishop:type = PieceType::Bishop;
|
||||||
type = PieceType::Bishop;
|
|
||||||
break;
|
break;
|
||||||
case PieceType::Rook:
|
case PieceType::Rook:type = PieceType::Rook;
|
||||||
type = PieceType::Rook;
|
|
||||||
break;
|
break;
|
||||||
case PieceType::Queen:
|
case PieceType::Queen:type = PieceType::Queen;
|
||||||
type = PieceType::Queen;
|
|
||||||
break;
|
break;
|
||||||
case PieceType::King:
|
case PieceType::King:type = PieceType::King;
|
||||||
type = PieceType::King;
|
|
||||||
break;
|
break;
|
||||||
default:
|
default:return std::nullopt;
|
||||||
return std::nullopt;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return Piece(color, type);
|
return Piece(color, type);
|
||||||
}
|
}
|
||||||
|
|
||||||
PieceColor Piece::color() const {
|
PieceColor Piece::color() const {
|
||||||
return _color;
|
return mColor;
|
||||||
}
|
}
|
||||||
|
|
||||||
PieceType Piece::type() const {
|
PieceType Piece::type() const {
|
||||||
return _type;
|
return mType;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool operator==(const Piece &lhs, const Piece &rhs) {
|
bool operator==(const Piece &lhs, const Piece &rhs) {
|
||||||
|
11
Piece.hpp
11
Piece.hpp
@@ -20,9 +20,6 @@ enum class PieceType {
|
|||||||
|
|
||||||
class Piece {
|
class Piece {
|
||||||
|
|
||||||
const PieceColor _color;
|
|
||||||
const PieceType _type;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
using Optional = std::optional<Piece>;
|
using Optional = std::optional<Piece>;
|
||||||
@@ -33,10 +30,14 @@ public:
|
|||||||
|
|
||||||
PieceColor color() const;
|
PieceColor color() const;
|
||||||
PieceType type() const;
|
PieceType type() const;
|
||||||
|
|
||||||
|
private:
|
||||||
|
const PieceColor mColor;
|
||||||
|
const PieceType mType;
|
||||||
};
|
};
|
||||||
|
|
||||||
bool operator==(const Piece& lhs, const Piece& rhs);
|
bool operator==(const Piece &lhs, const Piece &rhs);
|
||||||
std::ostream& operator<<(std::ostream& os, const Piece& piece);
|
std::ostream &operator<<(std::ostream &os, const Piece &piece);
|
||||||
|
|
||||||
// Invert a color (White becomes Black and vice versa)
|
// Invert a color (White becomes Black and vice versa)
|
||||||
PieceColor operator!(PieceColor color);
|
PieceColor operator!(PieceColor color);
|
||||||
|
Reference in New Issue
Block a user