[LIB-9] Add SAN, NAG, move number and result PGN tokens

[chesshog.git] / chesshog-format / src / main / java / org / hedgecode / chess / pgn / token / MovesToken.java

diff --git a/chesshog-format/src/main/java/org/hedgecode/chess/pgn/token/MovesToken.java b/chesshog-format/src/main/java/org/hedgecode/chess/pgn/token/MovesToken.java
index e766190..78de96c 100644 (file)
--- a/chesshog-format/src/main/java/org/hedgecode/chess/pgn/token/MovesToken.java
+++ b/chesshog-format/src/main/java/org/hedgecode/chess/pgn/token/MovesToken.java
@@ -34,7 +34,8 @@ public class MovesToken<Entity extends Moves> implements Token<Entity> {
 
         MOVE      ( new MoveToken()      ),
         COMMENT   ( new CommentToken()   ),
-        VARIATION ( new VariationToken() );
+        VARIATION ( new VariationToken() ),
+        RESULT    ( new ResultToken()    );
 
         private Token<Moves> token;
 
@@ -50,38 +51,50 @@ public class MovesToken<Entity extends Moves> implements Token<Entity> {
     private static final String MOVES_REGEX = "^\\s*([^\\s])";
     private static final Pattern MOVES_PATTERN = Pattern.compile(MOVES_REGEX);
 
+    private static final String RESULT_REGEX = "^\\s*(1-0|0-1|1/2-1/2|\\*)";
+    private static final Pattern RESULT_PATTERN = Pattern.compile(RESULT_REGEX);
+
     private static final String COMMENT = "{";
     private static final String VARIATION = "(";
 
     @Override
     public int token(Entity entity, String pgn) throws ParseException {
         int pgnLength = pgn.length();
-        pgn = PGNUtils.stripCrlf(pgn);
-        Token<Moves> token = assignToken(pgn);
-        while (token != null) {
-            int index = token.token(entity, pgn);
+        pgn = PGNUtils.stripCrlf(pgn); // todo: starting with ";" comments
+        boolean isResulted = false;
+        Type tokenType = tokenType(pgn);
+        while (tokenType != null) {
+            if (isResulted) {
+                throw new ParseException("parse.pgn.symbols.after.result", pgn);
+            }
+            int index = tokenType.token().token(entity, pgn);
+            if (tokenType.equals(Type.RESULT)) isResulted = true;
             pgn = pgn.substring(index);
-            token = assignToken(pgn);
+            tokenType = tokenType(pgn);
         }
         return pgnLength;
     }
 
-    private Token<Moves> assignToken(String pgn) {
-        Token<Moves> token = null;
-        Matcher moveMatcher = MOVES_PATTERN.matcher(pgn);
-        if (moveMatcher.find()) {
-            switch (moveMatcher.group(1)) {
-                case COMMENT:
-                    token = Type.COMMENT.token();
-                    break;
-                case VARIATION:
-                    token = Type.VARIATION.token();
-                    break;
-                default:
-                    token = Type.MOVE.token();
+    private Type tokenType(String pgn) {
+        Type type = null;
+        if (RESULT_PATTERN.matcher(pgn).find()) {
+            type = Type.RESULT;
+        } else {
+            Matcher moveMatcher = MOVES_PATTERN.matcher(pgn);
+            if (moveMatcher.find()) {
+                switch (moveMatcher.group(1)) {
+                    case COMMENT:
+                        type = Type.COMMENT;
+                        break;
+                    case VARIATION:
+                        type = Type.VARIATION;
+                        break;
+                    default:
+                        type = Type.MOVE;
+                }
             }
         }
-        return token;
+        return type;
     }
 
 }