X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=parser.l;h=8e3d397a1b6fefe7f76b1a7f792f2b3ad7003c69;hb=aae1b2706f58097dcdd1ee907e26add590d81df9;hp=ca41c63abb90626c01bc125f6faa4176eb976f9d;hpb=91d8e5853ca580769cc130aa6ea004869118d171;p=xboard.git

diff --git a/parser.l b/parser.l
old mode 100755
new mode 100644
index ca41c63..8e3d397
--- a/parser.l
+++ b/parser.l
@@ -7,12 +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-2001,2002,2003,2004,2005,2006,2007,2008,2009 Free Software
- * Foundation, Inc.
+ * 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:
@@ -243,8 +243,7 @@ extern void CopyBoard P((Board to, Board from));
       return (int) IllegalMove;
 
     result = LegalityTest(boards[yyboardindex],
-			  PosFlags(yyboardindex), EP_UNKNOWN,
-                          initialRights, /* [HGM] assume all castlings allowed */
+			  PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!
                           currentMoveString[1] - ONE,
                           currentMoveString[0] - AAA,
                           currentMoveString[3] - ONE,
@@ -304,8 +303,7 @@ extern void CopyBoard P((Board to, Board from));
       return 0;
 
     result = LegalityTest(boards[yyboardindex],
-			  PosFlags(yyboardindex), EP_UNKNOWN,
-                          initialRights, /* [HGM] assume all castlings allowed */
+			  PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!
                           currentMoveString[1] - ONE,
                           currentMoveString[0] - AAA,
                           currentMoveString[3] - ONE,
@@ -315,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);
@@ -358,8 +356,7 @@ extern void CopyBoard P((Board to, Board from));
       return IllegalMove;
 
 
-    Disambiguate(boards[yyboardindex],
-		 PosFlags(yyboardindex), EP_UNKNOWN, &cl);
+    Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);
 
     currentMoveString[0] = cl.ff + AAA;
     currentMoveString[1] = cl.rf + ONE;
@@ -413,8 +410,7 @@ extern void CopyBoard P((Board to, Board from));
     if(c != '=' && c != '+' && c != NULLCHAR && CharToPiece(c) == EmptySquare)
       return IllegalMove;
 
-    Disambiguate(boards[yyboardindex],
-		 PosFlags(yyboardindex), EP_UNKNOWN, &cl);
+    Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);
 
     currentMoveString[0] = cl.ff + AAA;
     currentMoveString[1] = cl.rf + ONE;
@@ -468,9 +464,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] == ')')
@@ -485,8 +485,7 @@ extern void CopyBoard P((Board to, Board from));
     }
 
     result = LegalityTest(boards[yyboardindex],
-			  PosFlags(yyboardindex), EP_UNKNOWN,
-                          initialRights, /* [HGM] assume all castlings allowed */
+			  PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!
                           currentMoveString[1] - ONE,
                           currentMoveString[0] - AAA,
                           currentMoveString[3] - ONE,
@@ -498,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);
@@ -525,8 +524,7 @@ extern void CopyBoard P((Board to, Board from));
     }
 
     result = LegalityTest(boards[yyboardindex],
-			  PosFlags(yyboardindex), EP_UNKNOWN,
-                          initialRights, /* [HGM] assume all castlings allowed */
+			  PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: might think we can e.p.!
                           currentMoveString[1] - ONE,
                           currentMoveString[0] - AAA,
                           currentMoveString[3] - ONE,
@@ -583,8 +581,7 @@ extern void CopyBoard P((Board to, Board from));
        cl.ftIn <  BOARD_LEFT     )
       return 0;
 
-    Disambiguate(boards[yyboardindex],
-		 PosFlags(yyboardindex), EP_UNKNOWN, &cl);
+    Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);
 
     currentMoveString[0] = cl.ff + AAA;
     currentMoveString[1] = cl.rf + ONE;
@@ -644,8 +641,7 @@ extern void CopyBoard P((Board to, Board from));
        cl.ftIn <  BOARD_LEFT     )
       return 0;
 
-    Disambiguate(boards[yyboardindex],
-		 PosFlags(yyboardindex), EP_UNKNOWN, &cl);
+    Disambiguate(boards[yyboardindex], PosFlags(yyboardindex), &cl);
 
     currentMoveString[0] = cl.ff + AAA;
     currentMoveString[1] = cl.rf + ONE;
@@ -690,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];
@@ -698,7 +694,10 @@ extern void CopyBoard P((Board to, Board from));
             ff = initialRights[5];
             ft = initialRights[4];
         }
-        fprintf(debugFP, "Parser FRC long %d %d\n", ff, ft);
+        if (appData.debugMode) 
+        {
+          fprintf(debugFP, "Parser FRC long %d %d\n", ff, ft);
+        };
         if(ff < 0 || ft < 0) return 0;
     }
     sprintf(currentMoveString, "%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE);
@@ -706,8 +705,7 @@ 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,
-                              castlingRights[yyboardindex], /* [HGM] use true castling rights */
+			      PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: e.p.!
 			      rf, ff, rt, ft, NULLCHAR);
 }
 
@@ -743,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];
@@ -762,8 +760,7 @@ extern void CopyBoard P((Board to, Board from));
     }
 
     return (int) LegalityTest(boards[yyboardindex],
-                              PosFlags(yyboardindex), EP_UNKNOWN,
-                              castlingRights[yyboardindex], /* [HGM] use true castling rights */
+			      PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: e.p.!
 			      rf, ff, rt, ft, NULLCHAR);
 }
 
@@ -836,11 +833,11 @@ extern void CopyBoard P((Board to, Board from));
     return (int) GameIsDrawn;
 }
 
-(([Ww](hite)?)|([Bb](lack)?))" "([Mm]ate(s|ed)?)|([Ww][io]n(s)?.*)  {
+(([Ww](hite)?)|([Bb](lack)?))" "(([Mm]ates)|([Ww][io]n(s)?)) { 
     return (int) (ToUpper(yytext[0]) == 'W' ? WhiteWins : BlackWins);
 }
 
-(([Ww](hite)?)|([Bb](lack)?))" "([Mm]ate(s|ed)?)|([Ll]os[tes]+.*)  {
+(([Ww](hite)?)|([Bb](lack)?))" "(([Mm]ated)|([Ll]os[tes]+)) { 
     return (int) (ToUpper(yytext[0]) == 'W' ? BlackWins : WhiteWins);
 }
 
@@ -909,7 +906,7 @@ extern void CopyBoard P((Board to, Board from));
     return (int) Comment; 
 }
 
-\([^()]*(\([^()]*\)[^()]*)+[^()]*\)  { 	  	/* nested () */
+\([^()]*(\([^()]*(\([^()]*(\([^()]*\)[^()]*)*\)[^()]*)*\)[^()]*)+[^()]*\)  { /* very nested () */
     return (int) Comment; 
 }
 
@@ -975,7 +972,7 @@ int yyoffset()
 static void output(ch)
      int ch;
 {
-    fprintf(stderr, "PARSER BUG: unmatched character '%c' (0%o)\n",
+    if(appData.debugMode) fprintf(debugFP, "PARSER BUG: unmatched character '%c' (0%o)\n",
 	    ch, ch);
 }
 
@@ -987,7 +984,7 @@ static void unput(ch)
 	StringToLex--;
     } else {
 	if (unputCount >= UNPUT_BUF_SIZE)
-	  fprintf(stderr, "PARSER BUG: unput buffer overflow '%c' (0%o)\n",
+	  if(appData.debugMode) fprintf(debugFP, "PARSER BUG: unput buffer overflow '%c' (0%o)\n",
 		  ch, ch);
 	unputBuffer[unputCount++] = ch;
     }