X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=parser.l;h=348bd1599b30e44157614a66e0d17bcc8c2f7b5c;hb=b37a8fe1087578a3236090958f2e503ad0bd2907;hp=7dda43f4b8b41061adffee9fc74495772d2b7adc;hpb=91e0735ab1cbc57465e0252bc95b90bc2ab13caa;p=xboard.git

diff --git a/parser.l b/parser.l
old mode 100755
new mode 100644
index 7dda43f..348bd15
--- a/parser.l
+++ b/parser.l
@@ -313,7 +313,7 @@ extern void CopyBoard P((Board to, Board from));
     if (currentMoveString[4] == NULLCHAR &&
         (result == WhitePromotionKnight || result == BlackPromotionKnight ||
          result == WhitePromotionQueen  || result == BlackPromotionQueen)) {
-        if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier)
+        if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)
             currentMoveString[4] = PieceToChar(BlackFerz);
         else if(gameInfo.variant == VariantGreat)
             currentMoveString[4] = PieceToChar(BlackMan);
@@ -497,7 +497,7 @@ extern void CopyBoard P((Board to, Board from));
          result == WhitePromotionKnight || result == BlackPromotionKnight)) {
         currentMoveString[4] = PieceToChar(BlackQueen);
 	// [HGM] shatranj: take care of variants without Queen
-	if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier)
+	if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)
             currentMoveString[4] = PieceToChar(BlackFerz);
 	if(gameInfo.variant == VariantGreat)
             currentMoveString[4] = PieceToChar(BlackMan);
@@ -686,7 +686,7 @@ extern void CopyBoard P((Board to, Board from));
             ft = BOARD_LEFT+2;
 	}
     }
-    if(gameInfo.variant == VariantFischeRandom) {
+    if(PosFlags(0) & F_FRC_TYPE_CASTLING) {
         if (WhiteOnMove(yyboardindex)) {
             ff = initialRights[2];
             ft = initialRights[1];
@@ -741,7 +741,7 @@ extern void CopyBoard P((Board to, Board from));
             ft = BOARD_RGHT-2;
 	}
     }
-    if(gameInfo.variant == VariantFischeRandom) {
+    if(PosFlags(0) & F_FRC_TYPE_CASTLING) {
         if (WhiteOnMove(yyboardindex)) {
             ff = initialRights[2];
             ft = initialRights[0];
@@ -1085,10 +1085,10 @@ int yywrap()
 
 /* Parse a move from the given string s */
 /* ^ at start of pattern WON'T work here unless using flex */
-ChessMove yylexstr(boardIndex, s)
-     int boardIndex;
-     char *s;
-{
+ChessMove yylexstr(boardIndex, s, text, len)
+     int boardIndex, len;
+     char *s, *text;
+{
     ChessMove ret;
     char *oldStringToLex;
 #ifdef FLEX_SCANNER
@@ -1104,7 +1104,9 @@ ChessMove yylexstr(boardIndex, s)
     yy_switch_to_buffer(buffer);
 #endif /*FLEX_SCANNER*/
 
-    ret = (ChessMove) yylex();
+    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;
 
 #ifdef FLEX_SCANNER
     if (oldBuffer != NULL)