\r
result = LegalityTest(boards[yyboardindex],\r
PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!\r
- EP_UNKNOWN,\r
- initialRights, /* [HGM] assume all castlings allowed */\r
currentMoveString[1] - ONE,\r
currentMoveString[0] - AAA,\r
currentMoveString[3] - ONE,\r
\r
result = LegalityTest(boards[yyboardindex],\r
PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!\r
- EP_UNKNOWN,\r
- initialRights, /* [HGM] assume all castlings allowed */\r
currentMoveString[1] - ONE,\r
currentMoveString[0] - AAA,\r
currentMoveString[3] - ONE,\r
if (currentMoveString[4] == NULLCHAR &&\r
(result == WhitePromotionKnight || result == BlackPromotionKnight ||\r
result == WhitePromotionQueen || result == BlackPromotionQueen)) {\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
else if(gameInfo.variant == VariantGreat)\r
currentMoveString[4] = PieceToChar(BlackMan);\r
return IllegalMove;\r
\r
\r
- Disambiguate(boards[yyboardindex],\r
- PosFlags(yyboardindex), EP_UNKNOWN, &cl);\r
+ Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);\r
\r
currentMoveString[0] = cl.ff + AAA;\r
currentMoveString[1] = cl.rf + ONE;\r
if(c != '=' && c != '+' && c != NULLCHAR && CharToPiece(c) == EmptySquare)\r
return IllegalMove;\r
\r
- Disambiguate(boards[yyboardindex],\r
- PosFlags(yyboardindex), EP_UNKNOWN, &cl);\r
+ Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);\r
\r
currentMoveString[0] = cl.ff + AAA;\r
currentMoveString[1] = cl.rf + ONE;\r
\r
result = LegalityTest(boards[yyboardindex],\r
PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!\r
- EP_UNKNOWN,\r
- initialRights, /* [HGM] assume all castlings allowed */\r
currentMoveString[1] - ONE,\r
currentMoveString[0] - AAA,\r
currentMoveString[3] - ONE,\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
\r
result = LegalityTest(boards[yyboardindex],\r
PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!\r
- EP_UNKNOWN,\r
- initialRights, /* [HGM] assume all castlings allowed */\r
currentMoveString[1] - ONE,\r
currentMoveString[0] - AAA,\r
currentMoveString[3] - ONE,\r
cl.ftIn < BOARD_LEFT )\r
return 0;\r
\r
- Disambiguate(boards[yyboardindex],\r
- PosFlags(yyboardindex), EP_UNKNOWN, &cl);\r
+ Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);\r
\r
currentMoveString[0] = cl.ff + AAA;\r
currentMoveString[1] = cl.rf + ONE;\r
cl.ftIn < BOARD_LEFT )\r
return 0;\r
\r
- Disambiguate(boards[yyboardindex],\r
- PosFlags(yyboardindex), EP_UNKNOWN, &cl);\r
+ Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);\r
\r
currentMoveString[0] = cl.ff + AAA;\r
currentMoveString[1] = cl.rf + ONE;\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
ff = initialRights[5];\r
ft = initialRights[4];\r
}\r
- fprintf(debugFP, "Parser FRC long %d %d\n", ff, ft);\r
+ if (appData.debugMode) \r
+ {\r
+ fprintf(debugFP, "Parser FRC long %d %d\n", ff, ft);\r
+ };\r
if(ff < 0 || ft < 0) return 0;\r
}\r
sprintf(currentMoveString, "%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE);\r
}\r
return (int) LegalityTest(boards[yyboardindex],\r
PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: e.p.!\r
- EP_UNKNOWN,\r
- castlingRights[yyboardindex], /* [HGM] use true castling rights */\r
rf, ff, rt, ft, NULLCHAR);\r
}\r
\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
\r
return (int) LegalityTest(boards[yyboardindex],\r
PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: e.p.!\r
- EP_UNKNOWN,\r
- castlingRights[yyboardindex], /* [HGM] use true castling rights */\r
rf, ff, rt, ft, NULLCHAR);\r
}\r
\r
return (int) GameIsDrawn;\r
}\r
\r
-(([Ww](hite)?)|([Bb](lack)?))" "([Mm]ate(s|ed)?)|([Ww][io]n(s)?.*) {\r
+(([Ww](hite)?)|([Bb](lack)?))" "(([Mm]ates)|([Ww][io]n(s)?)) { \r
return (int) (ToUpper(yytext[0]) == 'W' ? WhiteWins : BlackWins);\r
}\r
\r
-(([Ww](hite)?)|([Bb](lack)?))" "([Mm]ate(s|ed)?)|([Ll]os[tes]+.*) {\r
+(([Ww](hite)?)|([Bb](lack)?))" "(([Mm]ated)|([Ll]os[tes]+)) { \r
return (int) (ToUpper(yytext[0]) == 'W' ? BlackWins : WhiteWins);\r
}\r
\r
static void output(ch)\r
int ch;\r
{\r
- fprintf(stderr, "PARSER BUG: unmatched character '%c' (0%o)\n",\r
+ if(appData.debugMode) fprintf(debugFP, "PARSER BUG: unmatched character '%c' (0%o)\n",\r
ch, ch);\r
}\r
\r
StringToLex--;\r
} else {\r
if (unputCount >= UNPUT_BUF_SIZE)\r
- fprintf(stderr, "PARSER BUG: unput buffer overflow '%c' (0%o)\n",\r
+ if(appData.debugMode) fprintf(debugFP, "PARSER BUG: unput buffer overflow '%c' (0%o)\n",\r
ch, ch);\r
unputBuffer[unputCount++] = ch;\r
}\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