added book.c to Makefile.am
[xboard.git] / parser.l
old mode 100644 (file)
new mode 100755 (executable)
index 41feced..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
@@ -304,6 +314,8 @@ extern void CopyBoard P((Board to, Board from));
          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
@@ -448,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
@@ -483,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
@@ -1034,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