projects / xboard.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw
Merge commit 'v4.3.16'
[xboard.git] / parser.l
diff --git a/parser.l b/parser.l
old mode 100644 (file)
new mode 100755 (executable)
index da4cbc7..bdf11d0
--- a/parser.l
+++ b/parser.l
@@ -87,6 +87,16 @@ char *yy_text = (char *) yytext;
 \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
@@ -172,6 +182,7 @@ extern void CopyBoard P((Board to, Board from));
     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
@@ -190,6 +201,11 @@ extern void CopyBoard P((Board to, Board from));
     currentMoveString[3] = yytext[4+skip1+skip2];\r
     currentMoveString[4] = NULLCHAR;\r
     \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
@@ -218,7 +234,9 @@ extern void CopyBoard P((Board to, Board from));
     piece = boards[yyboardindex]\r
       [currentMoveString[1] - ONE][currentMoveString[0] - AAA];\r
     if(promoted) piece = (ChessSquare) (DEMOTED piece);\r
-    if (ToLower(yytext[skip3]) != ToLower(PieceToChar(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
@@ -240,9 +258,10 @@ extern void CopyBoard P((Board to, Board from));
     return (int) result;\r
 }\r
 \r
-[a-l][0-9][xX:-]?[a-l][0-9]((=?\(?[A-Z]\)?)|=)?      {\r
+[a-l][0-9][xX:-]?[a-l][0-9]((=?\(?[A-Za-z]\)?)|=)?      {\r
     /*\r
      * Simple algebraic move, possibly with promotion\r
+     * [HGM] Engine moves are received in this format, with lower-case promoChar!\r
      */\r
     int skip = 0;\r
     ChessMove result;\r
@@ -293,7 +312,12 @@ extern void CopyBoard P((Board to, Board from));
     if (currentMoveString[4] == NULLCHAR &&\r
         (result == WhitePromotionKnight || result == BlackPromotionKnight ||\r
          result == WhitePromotionQueen  || result == BlackPromotionQueen)) {\r
-        currentMoveString[4] = PieceToChar(BlackQueen);\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
@@ -436,7 +460,6 @@ extern void CopyBoard P((Board to, Board from));
 \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
@@ -471,6 +494,11 @@ extern void CopyBoard P((Board to, Board from));
         (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
@@ -539,6 +567,12 @@ extern void CopyBoard P((Board to, Board from));
     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.rtIn <  0            ||\r
@@ -553,7 +587,7 @@ extern void CopyBoard P((Board to, Board from));
     currentMoveString[1] = cl.rf + ONE;\r
     currentMoveString[2] = cl.ft + AAA;\r
     currentMoveString[3] = cl.rt + ONE;\r
-    currentMoveS\0tring[4] = cl.promoChar;\r
+    currentMoveString[4] = cl.promoChar;\r
     currentMoveString[5] = NULLCHAR;\r
 \r
     return (int) cl.kind;\r
@@ -633,33 +667,44 @@ extern void CopyBoard P((Board to, Board from));
             ff = (BOARD_WIDTH-1)>>1;\r
            rt = 0;\r
             ft = BOARD_RGHT-3;\r
-            sprintf(currentMoveString, "%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE);\r
        } else {\r
            rf = 0;\r
             ff = BOARD_WIDTH>>1;\r
            rt = 0;\r
             ft = BOARD_LEFT+2;\r
-            sprintf(currentMoveString, "%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE);\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_RGHT-3;\r
-            sprintf(currentMoveString, "%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE);\r
        } else {\r
             rf = BOARD_HEIGHT-1;\r
             ff = BOARD_WIDTH>>1;\r
             rt = BOARD_HEIGHT-1;\r
             ft = BOARD_LEFT+2;\r
-            sprintf(currentMoveString, "%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE);\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
+                              castlingRights[yyboardindex], /* [HGM] use true castling rights */\r
                              rf, ff, rt, ft, NULLCHAR);\r
 }\r
 \r
@@ -675,13 +720,11 @@ extern void CopyBoard P((Board to, Board from));
             ff = (BOARD_WIDTH-1)>>1;\r
            rt = 0;\r
             ft = BOARD_LEFT+1;\r
-            sprintf(currentMoveString, "%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE);\r
        } else {\r
            rf = 0;\r
             ff = BOARD_WIDTH>>1;\r
            rt = 0;\r
             ft = BOARD_RGHT-2;\r
-            sprintf(currentMoveString, "%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE);\r
        }\r
     } else {\r
         if (boards[yyboardindex][BOARD_HEIGHT-1][(BOARD_WIDTH-1)>>1] == BlackKing) {\r
@@ -690,18 +733,34 @@ extern void CopyBoard P((Board to, Board from));
             ff = (BOARD_WIDTH-1)>>1;\r
             rt = BOARD_HEIGHT-1;\r
             ft = BOARD_LEFT+1;\r
-            sprintf(currentMoveString, "%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE);\r
        } else {\r
             rf = BOARD_HEIGHT-1;\r
             ff = BOARD_WIDTH>>1;\r
             rt = BOARD_HEIGHT-1;\r
             ft = BOARD_RGHT-2;\r
-            sprintf(currentMoveString, "%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE);\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), EP_UNKNOWN,\r
+                              castlingRights[yyboardindex], /* [HGM] use true castling rights */\r
                              rf, ff, rt, ft, NULLCHAR);\r
 }\r
 \r
@@ -991,9 +1050,9 @@ static YY_BUFFER_STATE my_file_buffer = NULL;
 */\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
Graphical Chess board