Make parse_info a bit less regex-happy; speeds it up somewhat.

[remoteglot] / Board.pm

diff --git a/Board.pm b/Board.pm
index e6c04a30fef78a63a413efcebfd348efe586c1ce..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();
 
@@ -108,13 +108,12 @@ sub make_move {
                                        $nb->[$to_row + 1][$to_col] = '-';
                                }
                        }
-               } else {
-                       if (defined($promo) && $promo ne '') {
-                               if ($piece eq 'p') {
-                                       $piece = $promo;
-                               } else {
-                                       $piece = uc($promo);
-                               }
+               }
+               if (defined($promo) && $promo ne '') {
+                       if ($piece eq 'p') {
+                               $piece = lc($promo);
+                       } else {
+                               $piece = uc($promo);
                        }
                }
        }
@@ -145,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;
@@ -448,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";