Fix last_move_uci for PGN loads.

diff --git a/Board.pm b/Board.pm
index d6a0f5524869360b4f171f226aa17086fb34c8da..ff2828af82b03c60f6e2fcef4dd341e8d2d6ed0e 100644 (file)
--- a/Board.pm
+++ b/Board.pm
@@ -36,7 +36,7 @@ sub clone {
 # Returns a new board.
 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 $move = move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
        my $piece = $board->[$from_row][$from_col];
        my $nb = $board->clone();
 
@@ -144,7 +144,7 @@ sub _square_to_pos {
        return (_row_letter_to_num($2), _col_letter_to_num($1));
 }
 
-sub _move_to_uci_notation {
+sub move_to_uci_notation {
        my ($from_row, $from_col, $to_row, $to_col, $promo) = @_;
        $promo //= "";
        return _pos_to_square($from_row, $from_col) . _pos_to_square($to_row, $to_col) . $promo;
@@ -447,7 +447,7 @@ sub prettyprint_move {
 sub _prettyprint_move_no_check_or_mate {
         my ($board, $from_row, $from_col, $to_row, $to_col, $promo) = @_;
        my $piece = $board->[$from_row][$from_col];
-       my $move = _move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
+       my $move = move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
 
        if ($piece eq '-') {
                die "Invalid move $move";

diff --git a/Position.pm b/Position.pm
index 371e179b8139d9541b85d874917cbc1255ee1768..9868b218e6c4e2b74b5d2a21eeb8623d849d1295 100644 (file)
--- a/Position.pm
+++ b/Position.pm
@@ -29,6 +29,11 @@ sub new {
        $pos->{'player_w'} =~ s/^W?[FCIG]M//;
        $pos->{'player_b'} =~ s/^W?[FCIG]M//;
        $pos->{'move_num'} = $x[26];
+       if ($x[27] =~ /([a-h][1-8])-([a-h][1-8])/) {
+               $pos->{'last_move_uci'} = $1 . $2;
+       } else {
+               $pos->{'last_move_uci'} = undef;
+       }
        $pos->{'last_move'} = $x[29];
 
        bless $pos, $class;
@@ -179,6 +184,8 @@ sub make_move {
        $np->{'player_b'} = $pos->{'player_b'};
        my ($move, $nb) = $pos->{'board'}->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
        $np->{'last_move'} = $move;
+       $np->{'last_move_uci'} = Board::move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
+
        return bless $np;
 }