xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2025-12-12 17:12:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

DroidFish: Better error messages when trying to read invalid FEN/PGN data.

Browse Source
This commit is contained in:
Peter Osterlund
2011-12-27 15:19:32 +00:00
parent 4f2bc00259
commit 6dd495e234
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DroidFish/src/org/petero/droidfish/gamelogic/GameTree.java
View File

@@ -477,10 +477,13 @@ public class GameTree {
Node gameRoot = new Node(); Node gameRoot = new Node();
Node.parsePgn(scanner, gameRoot, options); Node.parsePgn(scanner, gameRoot, options);
// Store parsed data in GameTree if (tagPairs.size() == 0) {
if ((tagPairs.size() == 0) && (gameRoot.children.size() == 0)) gameRoot.verifyChildren(TextIO.readFEN(TextIO.startPosFEN));
if (gameRoot.children.size() == 0)
return false; return false;
}
// Store parsed data in GameTree
String fen = TextIO.startPosFEN; String fen = TextIO.startPosFEN;
int nTags = tagPairs.size(); int nTags = tagPairs.size();
for (int i = 0; i < nTags; i++) { for (int i = 0; i < nTags; i++) {

12
DroidFish/src/org/petero/droidfish/gamelogic/TextIO.java
View File

@@ -72,10 +72,18 @@ public class TextIO {
default: throw new ChessParseError(R.string.err_invalid_piece, pos); default: throw new ChessParseError(R.string.err_invalid_piece, pos);
} }
} }
if (words[1].length() == 0) {
if (words[1].length() > 0) {
boolean wtm;
switch (words[1].charAt(0)) {
case 'w': wtm = true; break;
case 'b': wtm = false; break;
default: throw new ChessParseError(R.string.err_invalid_side, pos);
}
pos.setWhiteMove(wtm);
} else {
throw new ChessParseError(R.string.err_invalid_side, pos); throw new ChessParseError(R.string.err_invalid_side, pos);
} }
pos.setWhiteMove(words[1].charAt(0) == 'w');
// Castling rights // Castling rights
int castleMask = 0; int castleMask = 0;