X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=3d636a2981a4e3c7a4b0a4eca516922dd0445eca;hp=29c1785be99aa35f0ca3bae5de52765bfd2cadd9;hb=9380b4df34192b8befdd5b4911953add3bf960f2;hpb=7f9d030c0ea78362dc8f1d5d18387c9605f82723

diff --git a/remoteglot.pl b/remoteglot.pl
index 29c1785..3d636a2 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -99,7 +99,7 @@ while (1) {
 		chomp $line;
 		$line =~ tr/\r//d;
 		if ($line =~ /^<12> /) {
-			my $pos = style12_to_fen($line);
+			my $pos = style12_to_pos($line);
 			
 			# if this is already in the queue, ignore it
 			next if (defined($pos_waiting) && $pos->{'fen'} eq $pos_waiting->{'fen'});
@@ -164,27 +164,7 @@ while (1) {
 	
 	# any fun on the UCI channel?
 	if ($nfound > 0 && vec($rout, fileno($engine->{'read'}), 1) == 1) {
-		# 
-		# Read until we've got a full line -- if the engine sends part of
-		# a line and then stops we're pretty much hosed, but that should
-		# never happen.
-		#
-		my $line = '';
-		while ($line !~ /\n/) {
-			my $tmp;
-			my $ret = sysread $engine->{'read'}, $tmp, 1;
-
-			if (!defined($ret)) {
-				next if ($!{EINTR});
-				die "error in reading from the UCI engine: $!";
-			} elsif ($ret == 0) {
-				die "EOF from UCI engine";
-			}
-
-			$line .= $tmp;
-		}
-
-		$line =~ tr/\r\n//d;
+		my $line = read_line($engine->{'read'});
 		handle_uci($line);
 		$sleep = 0;
 
@@ -297,16 +277,31 @@ sub parse_ids {
 	}
 }
 
-sub style12_to_fen {
+sub style12_to_pos {
 	my $str = shift;
 	my %pos = ();
 	my (@x) = split / /, $str;
 	
 	$pos{'board'} = [ @x[1..8] ];
 	$pos{'toplay'} = $x[9];
-	
+	$pos{'ep_file_num'} = $x[10];
+	$pos{'white_castle_k'} = $x[11];
+	$pos{'white_castle_q'} = $x[12];
+	$pos{'black_castle_k'} = $x[13];
+	$pos{'black_castle_q'} = $x[14];
+	$pos{'time_to_100move_rule'} = $x[15];
+	$pos{'move_num'} = $x[26];
+	$pos{'last_move'} = $x[29];
+	$pos{'fen'} = make_fen(\%pos);
+
+	return \%pos;
+}
+
+sub make_fen {
+	my $pos = shift;
+
 	# the board itself
-	my (@board) = @x[1..8];
+	my (@board) = @{$pos->{'board'}};
 	for my $rank (0..7) {
 		$board[$rank] =~ s/(-+)/length($1)/ge;
 	}
@@ -314,14 +309,14 @@ sub style12_to_fen {
 
 	# white/black to move
 	$fen .= " ";
-	$fen .= lc($x[9]);
+	$fen .= lc($pos->{'toplay'});
 
 	# castling
 	my $castling = "";
-	$castling .= "K" if ($x[11] == 1);
-	$castling .= "Q" if ($x[12] == 1);
-	$castling .= "k" if ($x[13] == 1);
-	$castling .= "q" if ($x[14] == 1);
+	$castling .= "K" if ($pos->{'white_castle_k'} == 1);
+	$castling .= "Q" if ($pos->{'white_castle_q'} == 1);
+	$castling .= "k" if ($pos->{'black_castle_k'} == 1);
+	$castling .= "q" if ($pos->{'black_castle_q'} == 1);
 	$castling = "-" if ($castling eq "");
 	# $castling = "-"; # chess960
 	$fen .= " ";
@@ -329,11 +324,11 @@ sub style12_to_fen {
 
 	# en passant
 	my $ep = "-";
-	if ($x[10] != -1) {
-		my $col = $x[10];
+	if ($pos->{'ep_file_num'} != -1) {
+		my $col = $pos->{'ep_file_num'};
 		my $nep = (qw(a b c d e f g h))[$col];
 
-		if ($x[9] eq 'B') {
+		if ($pos->{'toplay'} eq 'B') {
 			$nep .= "3";
 		} else {
 			$nep .= "6";
@@ -346,12 +341,12 @@ sub style12_to_fen {
 		# not, just lie -- it doesn't matter anyway. I'm unsure what's the
 		# "right" thing as per the standard, though.
 		#
-		if ($x[9] eq 'B') {
-			$ep = $nep if ($col > 0 && substr($pos{'board'}[4], $col-1, 1) eq 'p');
-			$ep = $nep if ($col < 7 && substr($pos{'board'}[4], $col+1, 1) eq 'p');
+		if ($pos->{'toplay'} eq 'B') {
+			$ep = $nep if ($col > 0 && substr($pos->{'board'}[4], $col-1, 1) eq 'p');
+			$ep = $nep if ($col < 7 && substr($pos->{'board'}[4], $col+1, 1) eq 'p');
 		} else {
-			$ep = $nep if ($col > 0 && substr($pos{'board'}[3], $col-1, 1) eq 'P');
-			$ep = $nep if ($col < 7 && substr($pos{'board'}[3], $col+1, 1) eq 'P');
+			$ep = $nep if ($col > 0 && substr($pos->{'board'}[3], $col-1, 1) eq 'P');
+			$ep = $nep if ($col < 7 && substr($pos->{'board'}[3], $col+1, 1) eq 'P');
 		}
 	}
 	$fen .= " ";
@@ -359,43 +354,27 @@ sub style12_to_fen {
 
 	# half-move clock
 	$fen .= " ";
-	$fen .= $x[15];
+	$fen .= $pos->{'time_to_100move_rule'};
 
 	# full-move clock
 	$fen .= " ";
-	$fen .= $x[26];
+	$fen .= $pos->{'move_num'};
 
-	$pos{'fen'} = $fen;
-	$pos{'move_num'} = $x[26];
-	$pos{'last_move'} = $x[29];
-
-	return \%pos;
+	return $fen;
 }
 
-sub prettyprint_pv {
-	my ($board, @pvs) = @_;
-
-	if (scalar @pvs == 0 || !defined($pvs[0])) {
-		return ();
-	}
-	
-	my @nb = @$board;
-
-	my $pv = shift @pvs;
-	my $from_col = ord(substr($pv, 0, 1)) - ord('a');
-	my $from_row = 7 - (ord(substr($pv, 1, 1)) - ord('1'));
-	my $to_col   = ord(substr($pv, 2, 1)) - ord('a');
-	my $to_row   = 7 - (ord(substr($pv, 3, 1)) - ord('1'));
-
-	my $pretty;
+sub make_move {
+	my ($board, $from_row, $from_col, $to_row, $to_col, $promo) = @_;
+	my $move = move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
 	my $piece = substr($board->[$from_row], $from_col, 1);
+	my @nb = @$board;
 
 	if ($piece eq '-') {
-		die "Invalid move $pv";
+		die "Invalid move $move";
 	}
 
 	# white short castling
-	if ($pv eq 'e1g1' && $piece eq 'K') {
+	if ($move eq 'e1g1' && $piece eq 'K') {
 		# king
 		substr($nb[7], 4, 1, '-');
 		substr($nb[7], 6, 1, $piece);
@@ -404,11 +383,11 @@ sub prettyprint_pv {
 		substr($nb[7], 7, 1, '-');
 		substr($nb[7], 5, 1, 'R');
 				
-		return ('0-0', prettyprint_pv(\@nb, @pvs));
+		return \@nb;
 	}
 
 	# white long castling
-	if ($pv eq 'e1c1' && $piece eq 'K') {
+	if ($move eq 'e1c1' && $piece eq 'K') {
 		# king
 		substr($nb[7], 4, 1, '-');
 		substr($nb[7], 2, 1, $piece);
@@ -417,11 +396,11 @@ sub prettyprint_pv {
 		substr($nb[7], 0, 1, '-');
 		substr($nb[7], 3, 1, 'R');
 				
-		return ('0-0-0', prettyprint_pv(\@nb, @pvs));
+		return \@nb;
 	}
 
 	# black short castling
-	if ($pv eq 'e8g8' && $piece eq 'k') {
+	if ($move eq 'e8g8' && $piece eq 'k') {
 		# king
 		substr($nb[0], 4, 1, '-');
 		substr($nb[0], 6, 1, $piece);
@@ -430,11 +409,11 @@ sub prettyprint_pv {
 		substr($nb[0], 7, 1, '-');
 		substr($nb[0], 5, 1, 'r');
 				
-		return ('0-0', prettyprint_pv(\@nb, @pvs));
+		return \@nb;
 	}
 
 	# black long castling
-	if ($pv eq 'e8c8' && $piece eq 'k') {
+	if ($move eq 'e8c8' && $piece eq 'k') {
 		# king
 		substr($nb[0], 4, 1, '-');
 		substr($nb[0], 2, 1, $piece);
@@ -443,15 +422,13 @@ sub prettyprint_pv {
 		substr($nb[0], 0, 1, '-');
 		substr($nb[0], 3, 1, 'r');
 				
-		return ('0-0-0', prettyprint_pv(\@nb, @pvs));
+		return \@nb;
 	}
 
 	# check if the from-piece is a pawn
 	if (lc($piece) eq 'p') {
 		# attack?
 		if ($from_col != $to_col) {
-			$pretty = substr($pv, 0, 1) . 'x' . substr($pv, 2, 2);
-
 			# en passant?
 			if (substr($board->[$to_row], $to_col, 1) eq '-') {
 				if ($piece eq 'p') {
@@ -460,6 +437,72 @@ sub prettyprint_pv {
 					substr($nb[$to_row - 1], $to_col, 1, '-');
 				}
 			}
+		} else {
+			if ($promo ne '') {
+				if ($piece eq 'p') {
+					$piece = $promo;
+				} else {
+					$piece = uc($promo);
+				}
+			}
+		}
+	}
+
+	# update the board
+	substr($nb[$from_row], $from_col, 1, '-');
+	substr($nb[$to_row], $to_col, 1, $piece);
+
+	return \@nb;
+}
+
+sub prettyprint_pv {
+	my ($board, @pvs) = @_;
+
+	if (scalar @pvs == 0 || !defined($pvs[0])) {
+		return ();
+	}
+
+	my $pv = shift @pvs;
+	my $from_col = col_letter_to_num(substr($pv, 0, 1));
+	my $from_row = row_letter_to_num(substr($pv, 1, 1));
+	my $to_col   = col_letter_to_num(substr($pv, 2, 1));
+	my $to_row   = row_letter_to_num(substr($pv, 3, 1));
+	my $promo    = substr($pv, 4, 1);
+
+	my $nb = make_move($board, $from_row, $from_col, $to_row, $to_col, $promo);
+	my $piece = substr($board->[$from_row], $from_col, 1);
+
+	if ($piece eq '-') {
+		die "Invalid move $pv";
+	}
+
+	# white short castling
+	if ($pv eq 'e1g1' && $piece eq 'K') {
+		return ('0-0', prettyprint_pv($nb, @pvs));
+	}
+
+	# white long castling
+	if ($pv eq 'e1c1' && $piece eq 'K') {
+		return ('0-0-0', prettyprint_pv($nb, @pvs));
+	}
+
+	# black short castling
+	if ($pv eq 'e8g8' && $piece eq 'k') {
+		return ('0-0', prettyprint_pv($nb, @pvs));
+	}
+
+	# black long castling
+	if ($pv eq 'e8c8' && $piece eq 'k') {
+		return ('0-0-0', prettyprint_pv($nb, @pvs));
+	}
+
+	my $pretty;
+
+	# check if the from-piece is a pawn
+	if (lc($piece) eq 'p') {
+		# attack?
+		if ($from_col != $to_col) {
+			$pretty = substr($pv, 0, 1) . 'x' . substr($pv, 2, 2);
 		} else {
 			$pretty = substr($pv, 2, 2);
 
@@ -520,17 +563,12 @@ sub prettyprint_pv {
 		$pretty .= substr($pv, 2, 2);
 	}
 
-	# update the board
-	substr($nb[$from_row], $from_col, 1, '-');
-	substr($nb[$to_row], $to_col, 1, $piece);
-
-	if (in_mate(\@nb)) {
+	if (in_mate($nb)) {
 		$pretty .= '#';
-	} elsif (in_check(\@nb) ne 'none') {
+	} elsif (in_check($nb) ne 'none') {
 		$pretty .= '+';
 	}
-
-	return ($pretty, prettyprint_pv(\@nb, @pvs));
+	return ($pretty, prettyprint_pv($nb, @pvs));
 }
 
 sub output_screen {
@@ -873,11 +911,17 @@ sub can_reach {
 		return (can_reach($board, 'R', $from_row, $from_col, $to_row, $to_col) ||
 		        can_reach($board, 'B', $from_row, $from_col, $to_row, $to_col));
 	}
+
+	# TODO: en passant
 	if ($piece eq 'p') {
 		# black pawn
 		if ($to_col == $from_col && $to_row == $from_row + 1) {
 			return ($dest_piece eq '-');
 		}
+		if ($to_col == $from_col && $from_row == 1 && $to_row == 3) {
+			my $middle_piece = substr($board->[2], $to_col, 1);
+			return ($dest_piece eq '-' && $middle_piece eq '-');
+		}
 		if (abs($to_col - $from_col) == 1 && $to_row == $from_row + 1) {
 			return ($dest_piece ne '-');
 		}
@@ -888,6 +932,10 @@ sub can_reach {
 		if ($to_col == $from_col && $to_row == $from_row - 1) {
 			return ($dest_piece eq '-');
 		}
+		if ($to_col == $from_col && $from_row == 6 && $to_row == 4) {
+			my $middle_piece = substr($board->[5], $to_col, 1);
+			return ($dest_piece eq '-' && $middle_piece eq '-');
+		}
 		if (abs($to_col - $from_col) == 1 && $to_row == $from_row - 1) {
 			return ($dest_piece ne '-');
 		}
@@ -1021,3 +1069,44 @@ sub open_engine {
 	
 	return $engine;
 }
+
+sub read_line {
+	my $fh = shift;
+
+	# 
+	# Read until we've got a full line -- if the engine sends part of
+	# a line and then stops we're pretty much hosed, but that should
+	# never happen.
+	#
+	my $line = '';
+	while ($line !~ /\n/) {
+		my $tmp;
+		my $ret = sysread $engine->{'read'}, $tmp, 1;
+
+		if (!defined($ret)) {
+			next if ($!{EINTR});
+			die "error in reading from the UCI engine: $!";
+		} elsif ($ret == 0) {
+			die "EOF from UCI engine";
+		}
+
+		$line .= $tmp;
+	}
+
+	$line =~ tr/\r\n//d;
+	return $line;
+}
+
+sub col_letter_to_num {
+	return ord(shift) - ord('a');
+}
+
+sub row_letter_to_num {
+	return 7 - (ord(shift) - ord('1'));
+}
+
+sub move_to_uci_notation {
+	my ($from_row, $from_col, $to_row, $to_col, $promo) = @_;
+	$promo //= "";
+	return sprintf("%c%d%c%d%s", ord('a') + $from_col, 8 - $from_row, ord('a') + $to_col, 8 - $to_row, $promo);
+}