X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=parser.c;h=06267a3df8a2fa649fdbba4631150390c1ccb8a6;hb=a6cb149215f419331165e3f8e484bcc492e7b9b1;hp=09bb390b54548591b8626fef39ac15f85b54f538;hpb=12fa48d7b282c15a16eefc5bdc246daa25ae4dfe;p=xboard.git

diff --git a/parser.c b/parser.c
index 09bb390..06267a3 100644
--- a/parser.c
+++ b/parser.c
@@ -133,7 +133,7 @@ char PromoSuffix(char **p)
     char *start = *p;
     if(**p == 'e' && (Match("ep", p) || Match("e.p.", p))) { *p = start; return NULLCHAR; } // non-compliant e.p. suffix is no promoChar!
     if(**p == '+' && gameInfo.variant == VariantShogi) { (*p)++; return '+'; } 
-    if(**p == '=') (*p)++; //optional =
+    if(**p == '=' || (gameInfo.variant == VariantSChess) && **p == '/') (*p)++; // optional = (or / for Seirawan gating)
     if(**p == '(' && (*p)[2] == ')' && isalpha( (*p)[1] )) { (*p) += 3; return (*p)[-2]; }
     if(isalpha(**p)) return *(*p)++;
     if(*p != start) return '='; // must be the optional =
@@ -144,7 +144,7 @@ int NextUnit(char **p)
 {	// Main parser routine
 	int coord[4], n, result, piece, i;
 	char type[4], promoted, separator, slash, *oldp, *commentEnd, c;
-        int wom = WhiteOnMove(yyboardindex);
+        int wom = quickFlag ? quickFlag&1 : WhiteOnMove(yyboardindex);
 
 	// ********* try white first, because it is so common **************************
 	if(**p == ' ' || **p == '\n' || **p == '\t') { parseStart = (*p)++; return Nothing; }
@@ -323,7 +323,8 @@ badMove:// we failed to find algebraic move
 		do (*p)++; while(isdigit(**p) || isalpha(**p) || **p == '+' ||
 				**p == '-' || **p == '=' || **p == '_' || **p == '#');
 		SkipWhite(p);
-		if(*(*p)++ == '"') {
+		if(**p == '"') {
+		    (*p)++;
 		    while(**p != '\n' && (*(*p)++ != '"'|| (*p)[-2] == '\\')); // look for unescaped quote
 		    if((*p)[-1] !='"') { *p = oldp; Scan(']', p); return Comment; } // string closing delimiter missing
 		    SkipWhite(p); if(*(*p)++ == ']') return PGNTag;
@@ -341,6 +342,9 @@ badMove:// we failed to find algebraic move
 		    Match("OO", p) || Match("oo", p) || Match("00", p)) castlingType = 1;
 	    if(castlingType) { //code from old parser, collapsed for both castling types, and streamlined a bit
 		int rf, ff, rt, ft; ChessSquare king;
+		char promo=NULLCHAR;
+
+		if(gameInfo.variant == VariantSChess) promo = PromoSuffix(p);
 
 		if (yyskipmoves) return (int) AmbiguousMove; /* not disambiguated */
 
@@ -356,7 +360,7 @@ badMove:// we failed to find algebraic move
 		ff = (BOARD_WIDTH-1)>>1; // this would be d-file
 	        if (boards[yyboardindex][rf][ff] == king) {
 		    /* ICS wild castling */
-        	    ft = castlingType == 1 ? BOARD_LEFT+1 : BOARD_RGHT-3;
+        	    ft = castlingType == 1 ? BOARD_LEFT+1 : (gameInfo.variant == VariantJanus ? BOARD_RGHT-2 : BOARD_RGHT-3);
 		} else {
         	    ff = BOARD_WIDTH>>1; // e-file
 	            ft = castlingType == 1 ? BOARD_RGHT-2 : BOARD_LEFT+2;
@@ -372,12 +376,12 @@ badMove:// we failed to find algebraic move
 		    if (appData.debugMode) fprintf(debugFP, "Parser FRC (type=%d) %d %d\n", castlingType, ff, ft);
 		    if(ff == NoRights || ft == NoRights) return ImpossibleMove;
 		}
-		sprintf(currentMoveString, "%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE);
+		sprintf(currentMoveString, "%c%c%c%c%c",ff+AAA,rf+ONE,ft+AAA,rt+ONE,promo);
 		if (appData.debugMode) fprintf(debugFP, "(%d-type) castling %d %d\n", castlingType, ff, ft);
 
 	        return (int) LegalityTest(boards[yyboardindex],
 			      PosFlags(yyboardindex)&~F_MANDATORY_CAPTURE, // [HGM] losers: e.p.!
-			      rf, ff, rt, ft, NULLCHAR);
+			      rf, ff, rt, ft, promo);
 	    }
 	}