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 &&\r
- (result == WhitePromotionKnight || result == BlackPromotionKnight ||\r
- result == WhitePromotionQueen || result == BlackPromotionQueen)) {\r
- if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier)\r
- currentMoveString[4] = PieceToChar(BlackFerz);\r
- else if(gameInfo.variant == VariantGreat)\r
- currentMoveString[4] = PieceToChar(BlackMan);\r
- else\r
- currentMoveString[4] = PieceToChar(BlackQueen);\r
- currentMoveString[5] = NULLCHAR;\r
- }\r
-\r
- return (int) result;\r
-}\r
-\r
-[a-l][0-9]((=?\(?[A-Z]\)?)|=)? {\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]((=?\(?[A-Za-z]\)?)|=)? {\r
/*\r
* Pawn move, possibly with promotion\r
*/\r
cl.ffIn = yytext[0] - AAA;\r
cl.rtIn = yytext[1] - ONE;\r
cl.ftIn = yytext[0] - AAA;\r
- c = cl.promoCharIn = yytext[2+skip];\r
+ c = cl.promoCharIn = ToLower(yytext[2+skip]);\r
\r
/* [HGM] do not allow values beyond board size */\r
if(cl.rtIn >= BOARD_HEIGHT ||\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
result == WhitePromotionKnight || result == BlackPromotionKnight)) {\r
currentMoveString[4] = PieceToChar(BlackQueen);\r
// [HGM] shatranj: take care of variants without Queen\r
- if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier)\r
+ if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)\r
currentMoveString[4] = PieceToChar(BlackFerz);\r
if(gameInfo.variant == VariantGreat)\r
currentMoveString[4] = PieceToChar(BlackMan);\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
ft = BOARD_LEFT+2;\r
}\r
}\r
- if(gameInfo.variant == VariantFischeRandom) {\r
+ if(PosFlags(0) & F_FRC_TYPE_CASTLING) {
if (WhiteOnMove(yyboardindex)) {\r
ff = initialRights[2];\r
ft = initialRights[1];\r
ft = BOARD_RGHT-2;\r
}\r
}\r
- if(gameInfo.variant == VariantFischeRandom) {\r
+ if(PosFlags(0) & F_FRC_TYPE_CASTLING) {
if (WhiteOnMove(yyboardindex)) {\r
ff = initialRights[2];\r
ft = initialRights[0];\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
\r
/* Parse a move from the given string s */\r
/* ^ at start of pattern WON'T work here unless using flex */\r
-ChessMove yylexstr(boardIndex, s)\r
- int boardIndex;\r
- char *s;\r
-{\r
+ChessMove yylexstr(boardIndex, s, text, len)\r
+ int boardIndex, len;\r
+ char *s, *text;\r
+{
ChessMove ret;\r
char *oldStringToLex;\r
#ifdef FLEX_SCANNER\r
yy_switch_to_buffer(buffer);\r
#endif /*FLEX_SCANNER*/\r
\r
- ret = (ChessMove) yylex();\r
+ ret = (ChessMove) yylex();
+ strncpy(text, yy_text, len-1); // [HGM] vari: yy_text is not available to caller after buffer switch ?!?
+ text[len-1] = NULLCHAR;\r
\r
#ifdef FLEX_SCANNER\r
if (oldBuffer != NULL) \r