%{\r
/*\r
* parser.l -- lex parser of algebraic chess moves for XBoard\r
- * $Id: parser.l,v 2.1 2003/10/27 19:21:00 mann Exp $\r
*\r
- * Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts.\r
- * Enhancements Copyright 1992-95 Free Software Foundation, Inc.\r
+ * Copyright 1991 by Digital Equipment Corporation, Maynard,\r
+ * Massachusetts.\r
+ *\r
+ * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005,\r
+ * 2006, 2007, 2008, 2009 Free Software Foundation, Inc.\r
*\r
* The following terms apply to Digital Equipment Corporation's copyright\r
* interest in XBoard:\r
* SOFTWARE.\r
* ------------------------------------------------------------------------\r
*\r
- * The following terms apply to the enhanced version of XBoard distributed\r
- * by the Free Software Foundation:\r
+ * The following terms apply to the enhanced version of XBoard\r
+ * distributed by the Free Software Foundation:\r
* ------------------------------------------------------------------------\r
- * This program is free software; you can redistribute it and/or modify\r
+ *\r
+ * GNU XBoard is free software: you can redistribute it and/or modify\r
* it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
+ * the Free Software Foundation, either version 3 of the License, or (at\r
+ * your option) any later version.\r
*\r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
- * GNU General Public License for more details.\r
+ * GNU XBoard is distributed in the hope that it will be useful, but\r
+ * WITHOUT ANY WARRANTY; without even the implied warranty of\r
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\r
+ * General Public License for more details.\r
*\r
* You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\r
- * ------------------------------------------------------------------------\r
- */\r
+ * along with this program. If not, see http://www.gnu.org/licenses/. \r
+ *\r
+ *------------------------------------------------------------------------\r
+ ** See the file ChangeLog for a revision history. */\r
\r
/* This parser handles all forms of promotion.\r
* The parser resolves ambiguous moves by searching and check-testing.\r
* It also parses comments of the form [anything] or (anything).\r
+ *\r
+ * [HGM] Parser extensively modified for bigger boards, Shogi-like syntax,\r
+ * and unknow pieces. All pieces are now mandatory upper case, but can be\r
+ * any letter A-Z. Files must be lower case (as before), but can run upto 'l'.\r
+ * Ranks can be 0-9. The parser returns 0 for off-board files and ranks.\r
+ * For an unknown piece (as mover or promotion piece) it returns\r
+ * IllegalMove, like it does when the piece doesn't match.\r
+ * Promotions can now also be appended Shogi-style, a bare '=' or '+',\r
+ * and this is then returned as promotion character. The piece indicator\r
+ * can be prefixed by a '+' to indicate it is a promoted piece.\r
*/\r
\r
#include "config.h"\r
\r
#ifdef FLEX_SCANNER\r
/* This is flex */\r
+/* [AP] use prototypes in function declarations */\r
+#define YY_USE_PROTOS\r
+\r
+#ifdef YY_USE_PROTOS\r
+#define YY_PROTO(proto) proto\r
+#else\r
+#define YY_PROTO(proto) ()\r
+#endif\r
+/* end of [AP] fix */\r
+\r
#undef YY_INPUT\r
#define YY_INPUT(buf, result, max_size) my_yy_input(buf, &result, max_size)\r
#undef YY_DECL\r
%}\r
%%\r
\r
-[RrBbNnQqKkPpACDEFGHMWO][/]?[a-l][0-9][xX:-]?[a-l][0-9](=?\(?[RrBbNnQqKkAaCc]\)?)? {\r
+"+"?[A-Z][/]?[a-l][0-9][xX:-]?[a-l][0-9]((=?\(?[A-Z]\)?)|=)? {\r
/*\r
* Fully-qualified algebraic move, possibly with promotion\r
- * [HGM] Bigger-than-8x8 boards must rely on long algebraic formats\r
- * where I allowed piece types A & C (also as promotions)\r
- * files a-l and ranks 0-9\r
*/\r
- int skip1 = 0, skip2 = 0;\r
+ int skip1 = 0, skip2 = 0, skip3 = 0, promoted = 0;\r
ChessSquare piece;\r
ChessMove result;\r
+ char c;\r
\r
if (yyskipmoves) return (int) AmbiguousMove; /* not disambiguated */\r
\r
+ if (yytext[0] == '+') skip1 = skip3 = promoted = 1; /* [HGM] Shogi promoted */\r
+\r
/* remove the / */\r
- if (yytext[1] == '/') skip1 = 1;\r
+ if (yytext[1+skip1] == '/') skip1++; \r
\r
/* remove the [xX:-] */\r
if ((yytext[3+skip1] == 'x') || (yytext[3+skip1] == 'X') ||\r
- (yytext[3+skip1] == '-') || (yytext[3+skip1] == ':')) skip2 = 1;\r
+ (yytext[3+skip1] == '-') || (yytext[3+skip1] == ':')) skip2 = 1;\r
\r
currentMoveString[0] = yytext[1+skip1];\r
currentMoveString[1] = yytext[2+skip1];\r
currentMoveString[3] = yytext[4+skip1+skip2];\r
currentMoveString[4] = NULLCHAR;\r
\r
- if (yyleng-skip1-skip2 > 5) {\r
- if (yytext[yyleng-1] == ')') {\r
- currentMoveString[4] = ToLower(yytext[yyleng-2]);\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "Parser Qa1b2: yyleng=%d\n",\r
+ yyleng);\r
+ }\r
+\r
+ if (yyleng-skip1-skip2 > 5) { char c;\r
+ if (yytext[yyleng-1] == ')') {\r
+ c = currentMoveString[4] = ToLower(yytext[yyleng-2]);\r
} else {\r
- currentMoveString[4] = ToLower(yytext[yyleng-1]);\r
+ c = currentMoveString[4] = ToLower(yytext[yyleng-1]);\r
}\r
currentMoveString[5] = NULLCHAR;\r
+ if(c != '=' && c != '+' && CharToPiece(c) == EmptySquare)\r
+ return IllegalMove; /* [HGM] promotion to invalid piece */\r
}\r
\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "parser: %s\n", currentMoveString);\r
+ }\r
/* [HGM] do not allow values beyond board size */\r
if(currentMoveString[1] - ONE >= BOARD_HEIGHT ||\r
- currentMoveString[0] - 'a' >= BOARD_WIDTH ||\r
+ currentMoveString[1] - ONE < 0 ||\r
+ currentMoveString[0] - AAA >= BOARD_RGHT ||\r
currentMoveString[3] - ONE >= BOARD_HEIGHT ||\r
- currentMoveString[2] - 'a' >= BOARD_WIDTH )\r
+ currentMoveString[3] - ONE < 0 ||\r
+ currentMoveString[2] - AAA >= BOARD_RGHT ||\r
+ currentMoveString[0] - AAA < BOARD_LEFT ||\r
+ currentMoveString[2] - AAA < BOARD_LEFT )\r
return 0;\r
\r
piece = boards[yyboardindex]\r
- [currentMoveString[1] - ONE][currentMoveString[0] - 'a'];\r
- if (ToLower(yytext[0]) != ToLower(PieceToChar(piece)))\r
+ [currentMoveString[1] - ONE][currentMoveString[0] - AAA];\r
+ if(promoted) piece = (ChessSquare) (DEMOTED piece);\r
+ c = PieceToChar(piece);\r
+ if(c == '~') c = PieceToChar((ChessSquare) (DEMOTED piece));\r
+ if (ToLower(yytext[skip3]) != ToLower(c))\r
return (int) IllegalMove;\r
\r
result = LegalityTest(boards[yyboardindex],\r
- PosFlags(yyboardindex), EP_UNKNOWN,\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] - 'a',\r
+ currentMoveString[0] - AAA,\r
currentMoveString[3] - ONE,\r
- currentMoveString[2] - 'a',\r
+ currentMoveString[2] - AAA,\r
currentMoveString[4]);\r
\r
if (currentMoveString[4] == NULLCHAR &&\r
- (result == WhitePromotionQueen || result == BlackPromotionQueen)) {\r
- currentMoveString[4] = 'q';\r
+ (result == WhitePromotionKnight || result == BlackPromotionKnight ||\r
+ result == WhitePromotionQueen || result == BlackPromotionQueen)) {\r
+ currentMoveString[4] = PieceToChar(BlackQueen);\r
currentMoveString[5] = NULLCHAR;\r
}\r
\r
return (int) result;\r
}\r
\r
-[a-l][0-9][xX:-]?[a-l][0-9](=?\(?[RrBbNnQqKkAaCc]\)?)? {\r
+[a-l][0-9][xX:-]?[a-l][0-9]((=?\(?[A-Za-z]\)?)|=)? {\r
/*\r
* Simple algebraic move, possibly with promotion\r
- * [HGM] Bigger-than-8x8 boards must rely on this format\r
- * where I allowed piece types A & C (also as promotions)\r
- * files a-l and ranks 0-9\r
+ * [HGM] Engine moves are received in this format, with lower-case promoChar!\r
*/\r
int skip = 0;\r
ChessMove result;\r
currentMoveString[3] = yytext[3+skip];\r
currentMoveString[4] = NULLCHAR;\r
\r
- if (yyleng-skip > 4) {\r
+ if (yyleng-skip > 4) { char c;\r
if (yytext[yyleng-1] == ')') {\r
- currentMoveString[4] = ToLower(yytext[yyleng-2]);\r
+ c = currentMoveString[4] = ToLower(yytext[yyleng-2]);\r
} else {\r
- currentMoveString[4] = ToLower(yytext[yyleng-1]);\r
+ c = currentMoveString[4] = ToLower(yytext[yyleng-1]);\r
}\r
currentMoveString[5] = NULLCHAR;\r
+ if(c != '=' && c != '+' && CharToPiece(c) == EmptySquare)\r
+ return IllegalMove;\r
}\r
\r
/* [HGM] do not allow values beyond board size */\r
if(currentMoveString[1] - ONE >= BOARD_HEIGHT ||\r
- currentMoveString[0] - 'a' >= BOARD_WIDTH ||\r
+ currentMoveString[1] - ONE < 0 ||\r
+ currentMoveString[0] - AAA >= BOARD_RGHT ||\r
currentMoveString[3] - ONE >= BOARD_HEIGHT ||\r
- currentMoveString[2] - 'a' >= BOARD_WIDTH )\r
+ currentMoveString[3] - ONE < 0 ||\r
+ currentMoveString[2] - AAA >= BOARD_RGHT ||\r
+ currentMoveString[0] - AAA < BOARD_LEFT ||\r
+ currentMoveString[2] - AAA < BOARD_LEFT )\r
return 0;\r
\r
result = LegalityTest(boards[yyboardindex],\r
- PosFlags(yyboardindex), EP_UNKNOWN,\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] - 'a',\r
+ currentMoveString[0] - AAA,\r
currentMoveString[3] - ONE,\r
- currentMoveString[2] - 'a',\r
+ currentMoveString[2] - AAA,\r
currentMoveString[4]);\r
\r
if (currentMoveString[4] == NULLCHAR &&\r
- (result == WhitePromotionQueen || result == BlackPromotionQueen)) {\r
- currentMoveString[4] = 'q';\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](=?\(?[RrBbNnQqKkAaCc]\)?)? {\r
+[a-l][0-9]((=?\(?[A-Z]\)?)|=)? {\r
/*\r
* Pawn move, possibly with promotion\r
*/\r
DisambiguateClosure cl;\r
- int skip = 0;\r
+ int skip = 0; char c;\r
\r
if (yyskipmoves) return (int) AmbiguousMove; /* not disambiguated */\r
\r
/* remove the =() */\r
- if (yytext[2] == '=') skip++;\r
+ if (yytext[2] == '=' && yytext[3] != NULLCHAR) skip++;\r
if (yytext[2+skip] == '(') skip++;\r
\r
cl.pieceIn = WhiteOnMove(yyboardindex) ? WhitePawn : BlackPawn;\r
cl.rfIn = -1;\r
- cl.ffIn = yytext[0] - 'a';\r
+ cl.ffIn = yytext[0] - AAA;\r
cl.rtIn = yytext[1] - ONE;\r
- cl.ftIn = yytext[0] - 'a';\r
- cl.promoCharIn = yytext[2+skip];\r
+ cl.ftIn = yytext[0] - AAA;\r
+ c = cl.promoCharIn = yytext[2+skip];\r
\r
/* [HGM] do not allow values beyond board size */\r
if(cl.rtIn >= BOARD_HEIGHT ||\r
- cl.ffIn >= BOARD_WIDTH ||\r
- cl.ftIn >= BOARD_WIDTH )\r
+ cl.rtIn < 0 ||\r
+ cl.ffIn >= BOARD_RGHT ||\r
+ cl.ftIn < BOARD_LEFT )\r
return 0;\r
\r
+ if(c != '=' && c != '+' && c != NULLCHAR && CharToPiece(c) == EmptySquare)\r
+ return IllegalMove;\r
+\r
\r
Disambiguate(boards[yyboardindex],\r
PosFlags(yyboardindex), EP_UNKNOWN, &cl);\r
\r
- currentMoveString[0] = cl.ff + 'a';\r
+ currentMoveString[0] = cl.ff + AAA;\r
currentMoveString[1] = cl.rf + ONE;\r
- currentMoveString[2] = cl.ft + 'a';\r
+ currentMoveString[2] = cl.ft + AAA;\r
currentMoveString[3] = cl.rt + ONE;\r
currentMoveString[4] = cl.promoChar;\r
currentMoveString[5] = NULLCHAR;\r
}\r
\r
\r
-(ab|bc|cd|de|ef|fg|gh|hi|ij|jk|kl|lk|kj|ji|ih|hg|gf|fe|ed|dc|cb|ba|aa|bb|cc|dd|ee|ff|gg|hh|ii|jj|kk|ll|([a-l][xX:-][a-l]))(=?\(?[RrBbNnQqKkAaCc]\)?)?(ep|"e.p.")? {\r
+(ab|bc|cd|de|ef|fg|gh|hi|ij|jk|kl|lk|kj|ji|ih|hg|gf|fe|ed|dc|cb|ba|aa|bb|cc|dd|ee|ff|gg|hh|ii|jj|kk|ll|([a-l][xX:-][a-l]))((=?\(?[A-Z]\)?)|ep|"e.p."|=)? {\r
/*\r
* Pawn capture, possibly with promotion, possibly ambiguous\r
*/\r
DisambiguateClosure cl;\r
- int skip1 = 0, skip2 = 0;\r
+ int skip1 = 0, skip2 = 0; char c;\r
\r
if (yyskipmoves) return (int) AmbiguousMove; /* not disambiguated */\r
\r
/* remove the [xX:-] and =() */\r
if ((yytext[1] == 'x') || (yytext[1] == 'X')\r
|| (yytext[1] == ':') || (yytext[1] == '-')) skip1 = 1;\r
- if (yytext[2+skip1] == '=') skip2++;\r
+ if (yytext[2+skip1] == '=' && yytext[3+skip1] != NULLCHAR) skip2++;\r
if (yytext[2+skip1+skip2] == '(') skip2++;\r
\r
cl.pieceIn = WhiteOnMove(yyboardindex) ? WhitePawn : BlackPawn;\r
cl.rfIn = -1;\r
- cl.ffIn = yytext[0] - 'a';\r
+ cl.ffIn = yytext[0] - AAA;\r
cl.rtIn = -1;\r
- cl.ftIn = yytext[1+skip1] - 'a';\r
- cl.promoCharIn = yytext[2+skip1+skip2];\r
+ cl.ftIn = yytext[1+skip1] - AAA;\r
+ c = cl.promoCharIn = yytext[2+skip1+skip2];\r
\r
/* [HGM] do not allow values beyond board size */\r
- if(cl.ffIn >= BOARD_WIDTH ||\r
- cl.ftIn >= BOARD_WIDTH )\r
+ if(cl.ffIn >= BOARD_RGHT ||\r
+ cl.ffIn < BOARD_LEFT ||\r
+ cl.ftIn >= BOARD_RGHT ||\r
+ cl.ftIn < BOARD_LEFT )\r
return 0;\r
\r
+ if(c != '=' && c != '+' && c != NULLCHAR && CharToPiece(c) == EmptySquare)\r
+ return IllegalMove;\r
+\r
Disambiguate(boards[yyboardindex],\r
PosFlags(yyboardindex), EP_UNKNOWN, &cl);\r
\r
- currentMoveString[0] = cl.ff + 'a';\r
+ currentMoveString[0] = cl.ff + AAA;\r
currentMoveString[1] = cl.rf + ONE;\r
- currentMoveString[2] = cl.ft + 'a';\r
+ currentMoveString[2] = cl.ft + AAA;\r
currentMoveString[3] = cl.rt + ONE;\r
currentMoveString[4] = cl.promoChar;\r
currentMoveString[5] = NULLCHAR;\r
return (int) cl.kind;\r
}\r
\r
-[a-l][xX:]?[a-l][0-9](=?\(?[RrBbNnQqKkAaCc]\)?)?(ep|"e.p.")? {\r
+[a-l][xX:]?[a-l][0-9]((=?\(?[A-Z]\)?)|ep|"e.p."|=)? {\r
/*\r
* unambiguously abbreviated Pawn capture, possibly with promotion\r
*/\r
int skip = 0;\r
- ChessMove result;\r
+ ChessMove result; char c;\r
\r
if (yyskipmoves) return (int) AmbiguousMove; /* not disambiguated */\r
\r
currentMoveString[3] = yytext[2+skip];\r
\r
/* [HGM] do not allow values beyond board size */\r
- if(currentMoveString[0] - 'a' >= BOARD_WIDTH ||\r
+ if(currentMoveString[0] - AAA >= BOARD_RGHT ||\r
currentMoveString[3] - ONE >= BOARD_HEIGHT ||\r
- currentMoveString[2] - 'a' >= BOARD_WIDTH )\r
+ currentMoveString[3] - ONE < 0 ||\r
+ currentMoveString[2] - AAA >= BOARD_RGHT ||\r
+ currentMoveString[0] - AAA < BOARD_LEFT ||\r
+ currentMoveString[2] - AAA < BOARD_LEFT )\r
return 0;\r
\r
if (gameInfo.variant == VariantXiangqi && /* [HGM] In Xiangqi rank stays same */\r
currentMoveString[0] != currentMoveString[2] ) {\r
- if (yytext[2+skip] == ONE) return (int) ImpossibleMove;\r
currentMoveString[1] = yytext[2+skip];\r
} else \r
if (WhiteOnMove(yyboardindex)) {\r
if (yytext[2+skip] == ONE) return (int) ImpossibleMove;\r
currentMoveString[1] = yytext[2+skip] - 1;\r
+ if(boards[yyboardindex][currentMoveString[1]-ONE][currentMoveString[0]-AAA] != WhitePawn) \r
+ return ImpossibleMove;\r
} else {\r
currentMoveString[1] = currentMoveString[3] + 1;\r
if (currentMoveString[3] == ONE+BOARD_HEIGHT-1) return (int) ImpossibleMove;\r
+ if(boards[yyboardindex][currentMoveString[1]-ONE][currentMoveString[0]-AAA] != BlackPawn) \r
+ return ImpossibleMove;\r
}\r
if (yyleng-skip > 3) {\r
if (yytext[yyleng-1] == ')')\r
- currentMoveString[4] = ToLower(yytext[yyleng-2]);\r
+ c = currentMoveString[4] = ToLower(yytext[yyleng-2]);\r
else\r
- currentMoveString[4] = ToLower(yytext[yyleng-1]);\r
+ c = currentMoveString[4] = ToLower(yytext[yyleng-1]);\r
currentMoveString[5] = NULLCHAR;\r
+ if(c != '=' && c != '+' && CharToPiece(c) == EmptySquare)\r
+ return IllegalMove;\r
} else {\r
currentMoveString[4] = NULLCHAR;\r
}\r
\r
result = LegalityTest(boards[yyboardindex],\r
- PosFlags(yyboardindex), EP_UNKNOWN,\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] - 'a',\r
+ currentMoveString[0] - AAA,\r
currentMoveString[3] - ONE,\r
- currentMoveString[2] - 'a',\r
+ currentMoveString[2] - AAA,\r
currentMoveString[4]);\r
\r
if (currentMoveString[4] == NULLCHAR &&\r
- (result == WhitePromotionQueen || result == BlackPromotionQueen)) {\r
- currentMoveString[4] = 'q';\r
+ (result == WhitePromotionQueen || result == BlackPromotionQueen ||\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
+ currentMoveString[4] = PieceToChar(BlackFerz);\r
+ if(gameInfo.variant == VariantGreat)\r
+ currentMoveString[4] = PieceToChar(BlackMan);\r
currentMoveString[5] = NULLCHAR;\r
}\r
\r
}\r
\r
result = LegalityTest(boards[yyboardindex],\r
- PosFlags(yyboardindex), EP_UNKNOWN,\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] - 'a',\r
+ currentMoveString[0] - AAA,\r
currentMoveString[3] - ONE,\r
- currentMoveString[2] - 'a',\r
+ currentMoveString[2] - AAA,\r
currentMoveString[4]);\r
\r
if (result == WhiteCapturesEnPassant || result == BlackCapturesEnPassant)\r
return (int) IllegalMove;\r
}\r
\r
-[RrBbNnQqKkACDEFGHMWO][xX:-]?[a-l][0-9] {\r
+"+"?[A-Z][xX:-]?[a-l][0-9]=? {\r
/*\r
* piece move, possibly ambiguous\r
*/\r
DisambiguateClosure cl;\r
- int skip = 0;\r
+ int skip = 0, skip2 = 0, promoted = 0;\r
\r
if (yyskipmoves) return (int) AmbiguousMove; /* not disambiguated */\r
\r
+ if(yytext[0] == '+') promoted = skip = skip2 = 1;\r
+\r
/* remove the [xX:-] */\r
- if ((yytext[1] == 'x') || (yytext[1] == 'X')\r
- || (yytext[1] == ':') || (yytext[1] == '-')) skip = 1;\r
+ if ((yytext[1+skip] == 'x') || (yytext[1+skip] == 'X')\r
+ || (yytext[1+skip] == ':') || (yytext[1+skip] == '-')) skip++;\r
\r
if (WhiteOnMove(yyboardindex)) {\r
- cl.pieceIn = CharToPiece(ToUpper(yytext[0]));\r
+ cl.pieceIn = CharToPiece(ToUpper(yytext[skip2]));\r
} else {\r
- cl.pieceIn = CharToPiece(ToLower(yytext[0]));\r
+ cl.pieceIn = CharToPiece(ToLower(yytext[skip2]));\r
}\r
+ if(promoted) cl.pieceIn = (ChessSquare) (PROMOTED cl.pieceIn);\r
+\r
cl.rfIn = -1;\r
cl.ffIn = -1;\r
cl.rtIn = yytext[2+skip] - ONE;\r
- cl.ftIn = yytext[1+skip] - 'a';\r
+ cl.ftIn = yytext[1+skip] - AAA;\r
cl.promoCharIn = NULLCHAR;\r
\r
+ if(yyleng-skip > 3) /* [HGM] can have Shogi-style promotion */\r
+ cl.promoCharIn = yytext[yyleng-1];\r
+\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "Parser Qa1: yyleng=%d, %d(%d,%d)-(%d,%d) = %d (%c)\n",\r
+ yyleng,\r
+ cl.pieceIn,cl.ffIn,cl.rfIn,cl.ftIn,cl.rtIn,cl.promoCharIn,cl.promoCharIn?cl.promoCharIn:' ');\r
+ }\r
+\r
/* [HGM] but do not allow values beyond board size */\r
if(cl.rtIn >= BOARD_HEIGHT ||\r
- cl.ftIn >= BOARD_WIDTH )\r
+ cl.rtIn < 0 ||\r
+ cl.ftIn >= BOARD_RGHT ||\r
+ cl.ftIn < BOARD_LEFT )\r
return 0;\r
\r
Disambiguate(boards[yyboardindex],\r
PosFlags(yyboardindex), EP_UNKNOWN, &cl);\r
\r
- currentMoveString[0] = cl.ff + 'a';\r
+ currentMoveString[0] = cl.ff + AAA;\r
currentMoveString[1] = cl.rf + ONE;\r
- currentMoveString[2] = cl.ft + 'a';\r
+ currentMoveString[2] = cl.ft + AAA;\r
currentMoveString[3] = cl.rt + ONE;\r
currentMoveString[4] = cl.promoChar;\r
currentMoveString[5] = NULLCHAR;\r
return (int) cl.kind;\r
}\r
\r
-[RrBbNnQqKkACDEFGHMWO][a-l0-9][xX:-]?[a-l][0-9] {\r
+"+"?[A-Z][a-l0-9][xX:-]?[a-l][0-9]=? {\r
/*\r
* piece move with rank or file disambiguator\r
*/\r
DisambiguateClosure cl;\r
- int skip = 0;\r
+ int skip = 0, skip2 = 0; int promoted=0;\r
\r
if (yyskipmoves) return (int) AmbiguousMove; /* not disambiguated */\r
\r
+ if(yytext[0]=='+') promoted = skip = skip2 = 1;\r
+\r
/* remove the [xX:-] */\r
- if ((yytext[2] == 'x') || (yytext[2] == 'X')\r
- || (yytext[2] == ':') || (yytext[2] == '-')) skip = 1;\r
+ if ((yytext[2+skip] == 'x') || (yytext[2+skip] == 'X')\r
+ || (yytext[2+skip] == ':') || (yytext[2+skip] == '-')) skip++;\r
\r
if (WhiteOnMove(yyboardindex)) {\r
- cl.pieceIn = CharToPiece(ToUpper(yytext[0]));\r
+ cl.pieceIn = CharToPiece(ToUpper(yytext[skip2]));\r
} else {\r
- cl.pieceIn = CharToPiece(ToLower(yytext[0]));\r
+ cl.pieceIn = CharToPiece(ToLower(yytext[skip2]));\r
}\r
- if (isalpha(yytext[1])) {\r
+ if(promoted) cl.pieceIn = (ChessSquare) (PROMOTED cl.pieceIn);\r
+\r
+ if (isalpha(yytext[1+skip2])) {\r
cl.rfIn = -1;\r
- cl.ffIn = yytext[1] - 'a';\r
+ cl.ffIn = yytext[1+skip2] - AAA;\r
+ \r
+ if(cl.ffIn >= BOARD_RGHT ||\r
+ cl.ffIn < BOARD_LEFT ) return 0;\r
} else {\r
- cl.rfIn = yytext[1] - ONE;\r
+ cl.rfIn = yytext[1+skip2] - ONE;\r
cl.ffIn = -1;\r
+ if(cl.rfIn >= BOARD_HEIGHT ||\r
+ cl.rfIn < 0) return 0;\r
}\r
cl.rtIn = yytext[3+skip] - ONE;\r
- cl.ftIn = yytext[2+skip] - 'a';\r
+ cl.ftIn = yytext[2+skip] - AAA;\r
cl.promoCharIn = NULLCHAR;\r
\r
+ if(yyleng-skip > 4) /* [HGM] can have Shogi-style promotion */\r
+ cl.promoCharIn = yytext[yyleng-1];\r
+\r
/* [HGM] do not allow values beyond board size */\r
if(cl.rtIn >= BOARD_HEIGHT ||\r
- cl.rfIn >= BOARD_HEIGHT ||\r
- cl.ffIn >= BOARD_WIDTH ||\r
- cl.ftIn >= BOARD_WIDTH )\r
+ cl.rtIn < 0 ||\r
+ cl.ftIn >= BOARD_RGHT ||\r
+ cl.ftIn < BOARD_LEFT )\r
return 0;\r
\r
Disambiguate(boards[yyboardindex],\r
PosFlags(yyboardindex), EP_UNKNOWN, &cl);\r
\r
- currentMoveString[0] = cl.ff + 'a';\r
+ currentMoveString[0] = cl.ff + AAA;\r
currentMoveString[1] = cl.rf + ONE;\r
- currentMoveString[2] = cl.ft + 'a';\r
+ currentMoveString[2] = cl.ft + AAA;\r
currentMoveString[3] = cl.rt + ONE;\r
currentMoveString[4] = cl.promoChar;\r
currentMoveString[5] = NULLCHAR;\r
rf = 0;\r
ff = (BOARD_WIDTH-1)>>1;\r
rt = 0;\r
- ft = BOARD_WIDTH-3;\r
- sprintf(currentMoveString, "%c%c%c%c",ff+'a',rf+ONE,ft+'a',rt+ONE);\r
+ ft = BOARD_RGHT-3;\r
} else {\r
rf = 0;\r
ff = BOARD_WIDTH>>1;\r
rt = 0;\r
- ft = 2;\r
- sprintf(currentMoveString, "%c%c%c%c",ff+'a',rf+ONE,ft+'a',rt+ONE);\r
+ ft = BOARD_LEFT+2;\r
}\r
} else{ \r
- if (boards[yyboardindex][BOARD_HEIGHT-1][3] == BlackKing) {\r
+ if (boards[yyboardindex][BOARD_HEIGHT-1][(BOARD_WIDTH-1)>>1] == BlackKing) {\r
/* ICS wild castling */\r
rf = BOARD_HEIGHT-1;\r
ff = (BOARD_WIDTH-1)>>1;\r
rt = BOARD_HEIGHT-1;\r
- ft = BOARD_WIDTH-3;\r
- sprintf(currentMoveString, "%c%c%c%c",ff+'a',rf+ONE,ft+'a',rt+ONE);\r
+ ft = BOARD_RGHT-3;\r
} else {\r
rf = BOARD_HEIGHT-1;\r
ff = BOARD_WIDTH>>1;\r
rt = BOARD_HEIGHT-1;\r
- ft = 2;\r
- sprintf(currentMoveString, "%c%c%c%c",ff+'a',rf+ONE,ft+'a',rt+ONE);\r
+ ft = BOARD_LEFT+2;\r
}\r
}\r
+ if(gameInfo.variant == VariantFischeRandom) {\r
+ if (WhiteOnMove(yyboardindex)) {\r
+ ff = initialRights[2];\r
+ ft = initialRights[1];\r
+ } else {\r
+ ff = initialRights[5];\r
+ ft = initialRights[4];\r
+ }\r
+ fprintf(debugFP, "Parser FRC long %d %d\n", ff, ft);\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
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "long castling %d %d\n", ff, ft);\r
+ }\r
return (int) LegalityTest(boards[yyboardindex],\r
- PosFlags(yyboardindex), EP_UNKNOWN,\r
- initialRights, /* [HGM] assume all castlings allowed */\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
rf = 0;\r
ff = (BOARD_WIDTH-1)>>1;\r
rt = 0;\r
- ft = 1;\r
- sprintf(currentMoveString, "%c%c%c%c",ff+'a',rf+ONE,ft+'a',rt+ONE);\r
+ ft = BOARD_LEFT+1;\r
} else {\r
rf = 0;\r
ff = BOARD_WIDTH>>1;\r
rt = 0;\r
- ft = BOARD_WIDTH-2;\r
- sprintf(currentMoveString, "%c%c%c%c",ff+'a',rf+ONE,ft+'a',rt+ONE);\r
+ ft = BOARD_RGHT-2;\r
}\r
} else {\r
if (boards[yyboardindex][BOARD_HEIGHT-1][(BOARD_WIDTH-1)>>1] == BlackKing) {\r
rf = BOARD_HEIGHT-1;\r
ff = (BOARD_WIDTH-1)>>1;\r
rt = BOARD_HEIGHT-1;\r
- ft = 1;\r
- sprintf(currentMoveString, "%c%c%c%c",ff+'a',rf+ONE,ft+'a',rt+ONE);\r
+ ft = BOARD_LEFT+1;\r
} else {\r
rf = BOARD_HEIGHT-1;\r
ff = BOARD_WIDTH>>1;\r
rt = BOARD_HEIGHT-1;\r
- ft = BOARD_WIDTH-2;\r
- sprintf(currentMoveString, "%c%c%c%c",ff+'a',rf+ONE,ft+'a',rt+ONE);\r
+ ft = BOARD_RGHT-2;\r
}\r
}\r
+ if(gameInfo.variant == VariantFischeRandom) {\r
+ if (WhiteOnMove(yyboardindex)) {\r
+ ff = initialRights[2];\r
+ ft = initialRights[0];\r
+ } else {\r
+ ff = initialRights[5];\r
+ ft = initialRights[3];\r
+ }\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "Parser FRC short %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
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "short castling %d %d\n", ff, ft);\r
+ }\r
+\r
return (int) LegalityTest(boards[yyboardindex],\r
- PosFlags(yyboardindex), EP_UNKNOWN,\r
- initialRights, /* [HGM] assume all castlings allowed */\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
-[PpNnBbRrQqAaCc]@[a-l][0-9] {\r
+[A-Z][@*][a-l][0-9] {\r
/* Bughouse piece drop. No legality checking for now. */\r
currentMoveString[1] = '@';\r
currentMoveString[2] = yytext[2];\r
currentMoveString[3] = yytext[3];\r
currentMoveString[4] = NULLCHAR;\r
\r
+ if (appData.debugMode) {\r
+ fprintf(debugFP, "Drop: %s\n", currentMoveString);\r
+ }\r
/* [HGM] do not allow values beyond board size */\r
- if(currentMoveString[1] - ONE >= BOARD_HEIGHT ||\r
- currentMoveString[0] - 'a' >= BOARD_WIDTH ||\r
- currentMoveString[3] - ONE >= BOARD_HEIGHT ||\r
- currentMoveString[2] - 'a' >= BOARD_WIDTH )\r
+ if(currentMoveString[3] - ONE >= BOARD_HEIGHT ||\r
+ currentMoveString[2] - AAA >= BOARD_WIDTH )\r
return 0;\r
\r
if (WhiteOnMove(yyboardindex)) {\r
*/\r
int yyoffset()\r
{\r
- int pos = yy_c_buf_p - yy_current_buffer->yy_ch_buf;\r
+ int pos = yy_c_buf_p - YY_CURRENT_BUFFER->yy_ch_buf;\r
\r
- return(ftell(yy_current_buffer->yy_input_file) -\r
+ return(ftell(YY_CURRENT_BUFFER->yy_input_file) -\r
yy_n_chars + pos);\r
}\r
\r
projects / xboard.git / blobdiff