Xshogi: build scanner separately from parser.

[gnushogi.git] / xshogi / scanner.l

diff --git a/xshogi/scanner.l b/xshogi/scanner.l
index 3dcf8dc..92ec42f 100644 (file)
--- a/xshogi/scanner.l
+++ b/xshogi/scanner.l
@@ -14,7 +14,7 @@
  * Modified implementation of ISS mode for XShogi:  Matthias Mutz
  * Current maintainer:                              Michael C. Vanier
  *
- * XShogi borrows its piece bitmaps from CRANES Shogi.
+ * XShogi borrows some of its piece bitmaps from CRANES Shogi.
  *
  * Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts.
  * Enhancements Copyright 1992 Free Software Foundation, Inc.
@@ -61,8 +61,11 @@
  * ------------------------------------------------------------------------
  *
  */
- 
-static int lines = 1, cols = 1;
+
+#include "parser.h"
+
+extern int lines, cols;
+
 %}
 
 PIECE   [PLNSGBRK]               
@@ -72,15 +75,19 @@ COMMENT ["#"]([^\n])*
 
 %%
 
-"\n"      { lines++; cols = 1; }
+"White wins" { return WHITE_WINS; }
+"Black wins" { return BLACK_WINS; }
+"Draw"       { return DRAW;       }
+
+"\n"      { lines++; cols = 1;       }
 "+"       { cols++;  return PROMOTE; }
-"*"       { cols++;  return DROPS; }
-"'"       { cols++;  return DROPS; }
-"."       { cols++;  return COLON; }
-{PIECE}   { yylval.string = yytext; cols += strlen(yytext); return PIECE;  }
-{SQUARE}  { yylval.string = yytext; cols += strlen(yytext); return SQUARE; }
-{NUMBER}  { yylval.string = yytext; cols += strlen(yytext); return NUMBER; }
-{COMMENT} { yylval.string = yytext; lines++; cols = 1; return COMMENT; }
+"*"       { cols++;  return DROPS;   }
+"'"       { cols++;  return DROPS;   }
+"."       { cols++;  return COLON;   }
+{PIECE}   { yylval.string = yytext; cols += strlen(yytext); return PIECE;   }
+{SQUARE}  { yylval.string = yytext; cols += strlen(yytext); return SQUARE;  }
+{NUMBER}  { yylval.string = yytext; cols += strlen(yytext); return NUMBER;  }
+{COMMENT} { yylval.string = yytext; lines++; cols = 1;      return COMMENT; }
 .         { cols++; }
 
 %%