/*
* parser.c --
*
- * Copyright 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+ * Copyright 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc.
* ------------------------------------------------------------------------
*
* GNU XBoard is free software: you can redistribute it and/or modify
int NextUnit P((char **p));
-int kifu = 0;
+int kifu = 0, xqUBB = 0;
char
GetKanji (char **p, int start)
int
ReadLine ()
{ // Read one line from the input file, and append to the buffer
- char c, *start = inPtr;
+ int c; char *start = inPtr;
if(fromString) return 0; // parsing string, so the end is a hard end
if(!inputFile) return 0;
while((c = fgetc(inputFile)) != EOF) {
if(**p == NULLCHAR) { // make sure there is something to parse
if(fromString) return 0; // we are parsing string, so the end is really the end
- *p = inPtr = inputBuf;
+ *p = inPtr = parseStart = inputBuf;
if(!ReadLine()) return 0; // EOF
} else if(inPtr > inputBuf + PARSEBUFSIZE/2) { // buffer fills up with already parsed stuff
char *q = *p, *r = inputBuf;
if(q = strchr(s, **p)) (*p)++, piece += 64*(q - s + 1);
if(**p == '/') slash = *(*p)++;
}
+
+ if(xqUBB) { // Xiangqi UBB movelist
+ while(isdigit(**p)) {
+ type[n] = NUMERIC; coord[n++] = *(*p)++ - '0';
+ if(n >= 4) break;
+ }
+ if(n < 4) *p -= n, xqUBB = n = 0; else type[0] = type[2] = ALPHABETIC, coord[1] = 9 - coord[1], coord[3] = 9 - coord[3];
+ }
while(n < 4) {
if(**p >= 'a' && **p < 'x') coord[n] = *(*p)++ - 'a', type[n++] = ALPHABETIC;
else if((i = Number(p)) != BADNUMBER) coord[n] = i, type[n++] = NUMERIC;
}
if( type[1] != type[2] && // means fromY is of opposite type as ToX, or NOTHING
(type[0] == NOTHING || type[0] == type[2]) ) { // well formed
-
+ int suffix = 7;
fromX = (currentMoveString[0] = coord[0] + 'a') - AAA;
fromY = (currentMoveString[1] = coord[1] + '0') - ONE;
currentMoveString[4] = cl.promoCharIn = PromoSuffix(p);
currentMoveString[5] = NULLCHAR;
+ if(**p == 'x' && !cl.promoCharIn) { // other leg follows
+ char *q = *p;
+ int x = *++*p, y;
+ ++*p; y = Number(p);
+ if(**p == '-' || **p == 'x') { // 3-leg move!
+ currentMoveString[7] = (kill2X = toX) + AAA; // what we thought was to-square is in fact 1st kill-square of two
+ currentMoveString[8] = (kill2Y = toY) + ONE; // append it after 2nd kill-square
+ toX = x - AAA; // kludge alert: this will become 2nd kill square
+ toY = y + '0' - ONE;
+ suffix += 2;
+ } else *p = q; // 2-leg move, rewind to leave reading of 2nd leg to code below
+ }
if(!cl.promoCharIn && (**p == '-' || **p == 'x')) { // Lion-type multi-leg move
currentMoveString[5] = (killX = toX) + AAA; // what we thought was to-square is in fact kill-square
currentMoveString[6] = (killY = toY) + ONE; // append it as suffix behind long algebraic move
currentMoveString[4] = ';';
- currentMoveString[7] = NULLCHAR;
+ currentMoveString[suffix+1] = NULLCHAR;
// read new to-square (VERY non-robust! Assumes correct (non-alpha-rank) syntax, and messes up on errors)
toX = cl.ftIn = (currentMoveString[2] = *++*p) - AAA; ++*p;
toY = cl.rtIn = (currentMoveString[3] = Number(p) + '0') - ONE;
+ currentMoveString[suffix] = cl.promoCharIn = PromoSuffix(p);
}
if(type[0] != NOTHING && type[1] != NOTHING && type[3] != NOTHING) { // fully specified.
ChessSquare realPiece = boards[yyboardindex][fromY][fromX];
if(killX < 0) // [HGM] lion: do not overwrite kill-square suffix
currentMoveString[4] = cl.promoChar;
- if((cl.kind == WhiteCapturesEnPassant || cl.kind == BlackCapturesEnPassant) && (Match("ep", p) || Match("e.p.", p)));
+ if((cl.kind == WhiteCapturesEnPassant || cl.kind == BlackCapturesEnPassant) && !Match("ep", p)) Match("e.p.", p);
return (int) cl.kind;
}
*p = oldp;
}
SkipWhite(p);
+ if(Match("DhtmlXQ", p)) { // Xiangqi UBB tags
+ int res = Nothing;
+ if(**p == ']') strcpy(parseStart = yytext, "[Variant \"xiangqi\"]"), res = PGNTag; else
+ if(Match("_movelist", p)) xqUBB = 1; else Scan(']', p);
+ Scan(']', p); // for non-movelist tags this skips to the closing tag (disarming any enclosed kanji)!
+ return res;
+ } else if(Match("/DhtmlXQ", p)) { Scan(']', p); return Nothing; }
if(isdigit(**p) || isalpha(**p)) {
do (*p)++; while(isdigit(**p) || isalpha(**p) || **p == '+' ||
**p == '-' || **p == '=' || **p == '_' || **p == '#');
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;
+ char promo=NULLCHAR, gate = 0;
- if(gameInfo.variant == VariantSChess) promo = PromoSuffix(p);
+ if(gameInfo.variant == VariantSChess) {
+ promo = PromoSuffix(p);
+ if(promo && **p >= 'a' && **p < AAA + BOARD_RGHT) gate = *(*p)++;
+ }
if (yyskipmoves) return (int) AmbiguousMove; /* not disambiguated */
if (appData.debugMode) fprintf(debugFP, "Parser FRC (type=%d) %d %d\n", castlingType, ff, ft);
if(ff == NoRights || ft == NoRights) return ImpossibleMove;
}
+ if(gate) { // gating disambiguator present
+ if(gate != ff + AAA) {
+ int h = ft; ft = ff; ff = h; // reverse for gating at Rook square
+ if(gate != AAA + initialRights[castlingType+(wom?-1:2)]) return ImpossibleMove;
+ }
+ }
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);
projects / xboard.git / blobdiff