profile

[xboard.git] / gamelist.c

diff --git a/gamelist.c b/gamelist.c
index 07619f2..11b06ac 100644 (file)
--- a/gamelist.c
+++ b/gamelist.c
@@ -1,7 +1,7 @@
 /*
  * gamelist.c -- Functions to manage a gamelist
  *
- * Copyright 1995, 2009, 2010 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010, 2011 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -47,7 +47,9 @@
 /* Variables
  */
 List gameList;
-
+extern Board initialPosition;
+extern int quickFlag;
+extern int movePtr;
 
 /* Local function prototypes
  */
@@ -212,10 +214,13 @@ int GameListBuild(f)
     ChessMove cm, lastStart;
     int gameNumber;
     ListGame *currentListGame = NULL;
-    int error;
+    int error, scratch=100, plyNr=0, fromX, fromY, toX, toY;
     int offset;
-    char lastComment[MSG_SIZ];
-
+    char lastComment[MSG_SIZ], buf[MSG_SIZ];
+struct {
+    long sec;  /* Assuming this is >= 32 bits */
+    int ms;    /* Assuming this is >= 16 bits */
+} t,t2; GetTimeMark(&t);
     GameListFree(&gameList);
     yynewfile(f);
     gameNumber = 0;
@@ -223,9 +228,10 @@ int GameListBuild(f)
     lastStart = (ChessMove) 0;
     yyskipmoves = FALSE;
     do {
-        yyboardindex = 0;
+        yyboardindex = scratch;
        offset = yyoffset();
-       cm = (ChessMove) yylex();
+       quickFlag = plyNr + 1;
+       cm = (ChessMove) Myylex();
        switch (cm) {
          case GNUChessGame:
            if ((error = GameListNewGame(&currentListGame))) {
@@ -280,15 +286,18 @@ int GameListBuild(f)
            do {
                yyboardindex = 1;
                offset = yyoffset();
-               cm = (ChessMove) yylex();
+               cm = (ChessMove) Myylex();
                if (cm == PGNTag) {
                    ParsePGNTag(yy_text, &currentListGame->gameInfo);
                }
            } while (cm == PGNTag || cm == Comment);
-           break;
+           if(1) { CopyBoard(boards[scratch], initialPosition); plyNr = 0; currentListGame->moves = PackGame(boards[scratch]); }
+           if(cm != NormalMove) break;
+         case IllegalMove:
+               if(appData.testLegality) break;
          case NormalMove:
            /* Allow the first game to start with an unnumbered move */
-           yyskipmoves = TRUE;
+           yyskipmoves = FALSE;
            if (lastStart == (ChessMove) 0) {
              if ((error = GameListNewGame(&currentListGame))) {
                rewind(f);
@@ -299,11 +308,37 @@ int GameListBuild(f)
              currentListGame->offset = offset;
              lastStart = MoveNumberOne;
            }
+         case WhiteCapturesEnPassant:
+         case BlackCapturesEnPassant:
+         case WhitePromotion:
+         case BlackPromotion:
+         case WhiteNonPromotion:
+         case BlackNonPromotion:
+         case WhiteKingSideCastle:
+         case WhiteQueenSideCastle:
+         case BlackKingSideCastle:
+         case BlackQueenSideCastle:
+         case WhiteKingSideCastleWild:
+         case WhiteQueenSideCastleWild:
+         case BlackKingSideCastleWild:
+         case BlackQueenSideCastleWild:
+         case WhiteHSideCastleFR:
+         case WhiteASideCastleFR:
+         case BlackHSideCastleFR:
+         case BlackASideCastleFR:
+               fromX = currentMoveString[0] - AAA;
+               fromY = currentMoveString[1] - ONE;
+               toX = currentMoveString[2] - AAA;
+               toY = currentMoveString[3] - ONE;
+               plyNr++;
+               ApplyMove(fromX, fromY, toX, toY, currentMoveString[4], boards[scratch]);
+               PackMove(fromX, fromY, toX, toY, currentMoveString[4]);
            break;
         case WhiteWins: // [HGM] rescom: save last comment as result details
         case BlackWins:
         case GameIsDrawn:
         case GameUnfinished:
+           if(!currentListGame) break;
            if (currentListGame->gameInfo.resultDetails != NULL) {
                free(currentListGame->gameInfo.resultDetails);
            }
@@ -316,10 +351,13 @@ int GameListBuild(f)
          default:
            break;
        }
+       if(gameNumber % 1000 == 0) {
+           snprintf(buf, MSG_SIZ,"Reading game file (%d)", gameNumber);
+           DisplayTitle(buf);
+       }
     }
     while (cm != (ChessMove) 0);
 
-
     if (appData.debugMode) {
        for (currentListGame = (ListGame *) gameList.head;
             currentListGame->node.succ;
@@ -330,7 +368,9 @@ int GameListBuild(f)
            PrintPGNTags(debugFP, &currentListGame->gameInfo);
        }
     }
-
+GetTimeMark(&t2);printf("GameListBuild %d msec\n", SubtractTimeMarks(&t2,&t));
+    quickFlag = 0;
+    DisplayTitle("WinBoard");
     rewind(f);
     yyskipmoves = FALSE;
     return 0;
@@ -435,7 +475,7 @@ char * GameListLine( int number, GameInfo * gameInfo )
             break;
         case GLT_WHITE_ELO:
             if( gameInfo->whiteRating > 0 )
-                sprintf( buf, "%d", gameInfo->whiteRating );
+             sprintf( buf,  "%d", gameInfo->whiteRating );
             else
              safeStrCpy( buf, "?" , 2*MSG_SIZ);
             break;
@@ -496,7 +536,6 @@ char * GameListLineFull( int number, GameInfo * gameInfo )
 
     return ret;
 }
-
 // --------------------------------------- Game-List options dialog --------------------------------------
 
 // back-end