X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=parser.c;h=0938242c37449bb9bdd18a7f08336d7dc00643df;hb=985cec56a6e655776b35dfeaf338f748808651da;hp=c2eda2b25422e4de0591a23359a6441ac6b2bf9c;hpb=af3d528cf16eae800ff7f0b8b62f77ced7493412;p=xboard.git

diff --git a/parser.c b/parser.c
index c2eda2b..0938242 100644
--- a/parser.c
+++ b/parser.c
@@ -172,7 +172,7 @@ unsigned char kanjiTab[] = {
 
 int NextUnit P((char **p));
 
-int kifu = 0;
+int kifu = 0, xqUBB = 0;
 
 char
 GetKanji (char **p, int start)
@@ -285,7 +285,7 @@ KifuMove (char **p)
 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) {
@@ -404,7 +404,7 @@ NextUnit (char **p)
 
 	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;
@@ -426,6 +426,14 @@ NextUnit (char **p)
 	     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;
@@ -585,7 +593,7 @@ NextUnit (char **p)
 		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;
 	    }
@@ -604,6 +612,13 @@ badMove:// we failed to find algebraic move
 		*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 == '#');