X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=parser.l;h=82957eb41b19cd497b761c42cebb4580bddd6baf;hp=bdf11d0858cc47fa13a7a8f1c37ab9039e2ebdb5;hb=d016fb202fe45795e630e22ba516e754cf694ea6;hpb=ea750683ac62717dd7346de17b5ae072622ff92a

diff --git a/parser.l b/parser.l
index bdf11d0..82957eb 100755
--- a/parser.l
+++ b/parser.l
@@ -7,10 +7,12 @@
 %{
 /*
  * parser.l -- lex parser of algebraic chess moves for XBoard
- * $Id: parser.l,v 2.1 2003/10/27 19:21:00 mann Exp $
  *
- * Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts.
- * Enhancements Copyright 1992-95 Free Software Foundation, Inc.
+ * Copyright 1991 by Digital Equipment Corporation, Maynard,
+ * Massachusetts.
+ *
+ * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005,
+ * 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
  *
  * The following terms apply to Digital Equipment Corporation's copyright
  * interest in XBoard:
@@ -34,24 +36,25 @@
  * SOFTWARE.
  * ------------------------------------------------------------------------
  *
- * The following terms apply to the enhanced version of XBoard distributed
- * by the Free Software Foundation:
+ * The following terms apply to the enhanced version of XBoard
+ * distributed by the Free Software Foundation:
  * ------------------------------------------------------------------------
- * This program is free software; you can redistribute it and/or modify
+ *
+ * GNU XBoard is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU XBoard is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- * ------------------------------------------------------------------------
- */
+ * along with this program. If not, see http://www.gnu.org/licenses/.  
+ *
+ *------------------------------------------------------------------------
+ ** See the file ChangeLog for a revision history.  */
 
 /* This parser handles all forms of promotion.
  * The parser resolves ambiguous moves by searching and check-testing.
@@ -240,7 +243,8 @@ extern void CopyBoard P((Board to, Board from));
       return (int) IllegalMove;
 
     result = LegalityTest(boards[yyboardindex],
-			  PosFlags(yyboardindex), EP_UNKNOWN,
+			  PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!
+			  EP_UNKNOWN,
                           initialRights, /* [HGM] assume all castlings allowed */
                           currentMoveString[1] - ONE,
                           currentMoveString[0] - AAA,
@@ -301,7 +305,8 @@ extern void CopyBoard P((Board to, Board from));
       return 0;
 
     result = LegalityTest(boards[yyboardindex],
-			  PosFlags(yyboardindex), EP_UNKNOWN,
+			  PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!
+			  EP_UNKNOWN,
                           initialRights, /* [HGM] assume all castlings allowed */
                           currentMoveString[1] - ONE,
                           currentMoveString[0] - AAA,
@@ -465,9 +470,13 @@ extern void CopyBoard P((Board to, Board from));
     if (WhiteOnMove(yyboardindex)) {
         if (yytext[2+skip] == ONE) return (int) ImpossibleMove;
 	currentMoveString[1] = yytext[2+skip] - 1;
+	if(boards[yyboardindex][currentMoveString[1]-ONE][currentMoveString[0]-AAA] != WhitePawn) 
+		return ImpossibleMove;
     } else {
         currentMoveString[1] = currentMoveString[3] + 1;
         if (currentMoveString[3] == ONE+BOARD_HEIGHT-1) return (int) ImpossibleMove;
+	if(boards[yyboardindex][currentMoveString[1]-ONE][currentMoveString[0]-AAA] != BlackPawn) 
+		return ImpossibleMove;
     }
     if (yyleng-skip > 3) {
 	if (yytext[yyleng-1] == ')')
@@ -482,7 +491,8 @@ extern void CopyBoard P((Board to, Board from));
     }
 
     result = LegalityTest(boards[yyboardindex],
-			  PosFlags(yyboardindex), EP_UNKNOWN,
+			  PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!
+			  EP_UNKNOWN,
                           initialRights, /* [HGM] assume all castlings allowed */
                           currentMoveString[1] - ONE,
                           currentMoveString[0] - AAA,
@@ -522,7 +532,8 @@ extern void CopyBoard P((Board to, Board from));
     }
 
     result = LegalityTest(boards[yyboardindex],
-			  PosFlags(yyboardindex), EP_UNKNOWN,
+			  PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!
+			  EP_UNKNOWN,
                           initialRights, /* [HGM] assume all castlings allowed */
                           currentMoveString[1] - ONE,
                           currentMoveString[0] - AAA,
@@ -703,7 +714,8 @@ extern void CopyBoard P((Board to, Board from));
         fprintf(debugFP, "long castling %d %d\n", ff, ft);
     }
     return (int) LegalityTest(boards[yyboardindex],
-			      PosFlags(yyboardindex), EP_UNKNOWN,
+			      PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: e.p.!
+			      EP_UNKNOWN,
                               castlingRights[yyboardindex], /* [HGM] use true castling rights */
 			      rf, ff, rt, ft, NULLCHAR);
 }
@@ -759,7 +771,8 @@ extern void CopyBoard P((Board to, Board from));
     }
 
     return (int) LegalityTest(boards[yyboardindex],
-                              PosFlags(yyboardindex), EP_UNKNOWN,
+			      PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: e.p.!
+			      EP_UNKNOWN,
                               castlingRights[yyboardindex], /* [HGM] use true castling rights */
 			      rf, ff, rt, ft, NULLCHAR);
 }