currentMoveString[2] - AAA >= BOARD_RGHT ||\r
currentMoveString[0] - AAA < BOARD_LEFT ||\r
currentMoveString[2] - AAA < BOARD_LEFT )\r
- return 0;\r
+ return ImpossibleMove;\r
\r
piece = boards[yyboardindex]\r
[currentMoveString[1] - ONE][currentMoveString[0] - AAA];\r
currentMoveString[2] - AAA >= BOARD_RGHT ||\r
currentMoveString[0] - AAA < BOARD_LEFT ||\r
currentMoveString[2] - AAA < BOARD_LEFT )\r
- return 0;\r
+ return ImpossibleMove;\r
\r
result = LegalityTest(boards[yyboardindex],\r
PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!\r
currentMoveString[2] - AAA,\r
currentMoveString[4]);\r
\r
+ if (currentMoveString[4] == NULLCHAR) {
+ if(result == WhitePromotionKnight || result == BlackPromotionKnight ||
+ result == WhitePromotionQueen || result == BlackPromotionQueen) {
+ if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)
+ currentMoveString[4] = PieceToChar(BlackFerz);
+ else if(gameInfo.variant == VariantGreat)
+ currentMoveString[4] = PieceToChar(BlackMan);
+ else
+ currentMoveString[4] = PieceToChar(BlackQueen);
+ currentMoveString[5] = NULLCHAR;
+ }
+ } else if(appData.testLegality && // strip off unnecessary and false promo characters
+ !(result == WhitePromotionQueen || result == BlackPromotionQueen ||
+ result == WhiteNonPromotion || result == BlackNonPromotion)) currentMoveString[4] = NULLCHAR;
+
+ return (int) result;
+}
+
+[A-L][0-9][xX:-]?[A-L][0-9] {
+ /*
+ * Simple algebraic move, in capitals
+ * [HGM] Engine moves are received in this format, with lower-case promoChar!
+ */
+ int skip = 0;
+ ChessMove result;
+
+ if (yyskipmoves) return (int) AmbiguousMove; /* not disambiguated */
+
+ /* remove the [xX:-] */
+ if ((yytext[2] == 'x') || (yytext[2] == 'X') ||
+ (yytext[2] == '-') || (yytext[2] == ':')) skip = 1;
+
+ currentMoveString[0] = yytext[0]+32;
+ currentMoveString[1] = yytext[1];
+ currentMoveString[2] = yytext[2+skip]+32;
+ currentMoveString[3] = yytext[3+skip];
+ currentMoveString[4] = NULLCHAR;
+
+ /* [HGM] do not allow values beyond board size */
+ if(currentMoveString[1] - ONE >= BOARD_HEIGHT ||
+ currentMoveString[1] - ONE < 0 ||
+ currentMoveString[0] - AAA >= BOARD_RGHT ||
+ currentMoveString[3] - ONE >= BOARD_HEIGHT ||
+ currentMoveString[3] - ONE < 0 ||
+ currentMoveString[2] - AAA >= BOARD_RGHT ||
+ currentMoveString[0] - AAA < BOARD_LEFT ||
+ currentMoveString[2] - AAA < BOARD_LEFT )
+ return ImpossibleMove;
+
+ result = LegalityTest(boards[yyboardindex],
+ PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!
+ currentMoveString[1] - ONE,
+ currentMoveString[0] - AAA,
+ currentMoveString[3] - ONE,
+ currentMoveString[2] - AAA,
+ currentMoveString[4]);
+
if (currentMoveString[4] == NULLCHAR &&\r
(result == WhitePromotionKnight || result == BlackPromotionKnight ||\r
result == WhitePromotionQueen || result == BlackPromotionQueen)) {\r
else\r
currentMoveString[4] = PieceToChar(BlackQueen);\r
currentMoveString[5] = NULLCHAR;\r
- }\r
+ } else if(appData.testLegality && // strip off unnecessary and false promo characters
+ !(result == WhitePromotionQueen || result == BlackPromotionQueen ||
+ result == WhiteNonPromotion || result == BlackNonPromotion)) currentMoveString[4] = NULLCHAR;
\r
return (int) result;\r
}\r
cl.rtIn < 0 ||\r
cl.ffIn >= BOARD_RGHT ||\r
cl.ftIn < BOARD_LEFT )\r
- return 0;\r
+ return ImpossibleMove;\r
\r
if(c != '=' && c != '+' && c != NULLCHAR && CharToPiece(c) == EmptySquare)\r
return IllegalMove;\r
cl.ffIn < BOARD_LEFT ||\r
cl.ftIn >= BOARD_RGHT ||\r
cl.ftIn < BOARD_LEFT )\r
- return 0;\r
+ return ImpossibleMove;\r
\r
if(c != '=' && c != '+' && c != NULLCHAR && CharToPiece(c) == EmptySquare)\r
return IllegalMove;\r
currentMoveString[2] - AAA >= BOARD_RGHT ||\r
currentMoveString[0] - AAA < BOARD_LEFT ||\r
currentMoveString[2] - AAA < BOARD_LEFT )\r
- return 0;\r
+ return ImpossibleMove;\r
\r
if (gameInfo.variant == VariantXiangqi && /* [HGM] In Xiangqi rank stays same */\r
currentMoveString[0] != currentMoveString[2] ) {\r
cl.rtIn < 0 ||\r
cl.ftIn >= BOARD_RGHT ||\r
cl.ftIn < BOARD_LEFT )\r
- return 0;\r
+ return ImpossibleMove;\r
\r
Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);\r
\r
cl.rtIn < 0 ||\r
cl.ftIn >= BOARD_RGHT ||\r
cl.ftIn < BOARD_LEFT )\r
- return 0;\r
+ return ImpossibleMove;\r
\r
Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);\r
\r
}\r
\r
[A-Z][@*][a-l][0-9] {\r
- /* Bughouse piece drop. No legality checking for now. */\r
+ /* Bughouse piece drop. */\r
currentMoveString[1] = '@';\r
currentMoveString[2] = yytext[2];\r
currentMoveString[3] = yytext[3];\r
/* [HGM] do not allow values beyond board size */\r
if(currentMoveString[3] - ONE >= BOARD_HEIGHT ||\r
currentMoveString[2] - AAA >= BOARD_WIDTH )\r
- return 0;\r
+ return ImpossibleMove;\r
\r
if (WhiteOnMove(yyboardindex)) {\r
currentMoveString[0] = ToUpper(yytext[0]);\r
- return (int) WhiteDrop;\r
} else {\r
currentMoveString[0] = ToLower(yytext[0]);\r
- return (int) BlackDrop;\r
}\r
+ return LegalityTest(boards[yyboardindex], PosFlags(yyboardindex), DROP_RANK, // [HGM] does drops now too
+ CharToPiece(currentMoveString[0]), currentMoveString[3] - ONE, currentMoveString[2] - AAA, NULLCHAR);
}\r
\r
[Rr]esign(s|ed)? {\r