fix this algorithm, again (jasonshaev)

2 files changed, 33 insertions, 7 deletions

diff --git a/lib/Spreadsheet/Template/Helpers/Xslate.pm b/lib/Spreadsheet/Template/Helpers/Xslate.pm
index 8712656..56df981 100644
--- a/lib/Spreadsheet/Template/Helpers/Xslate.pm
+++ b/lib/Spreadsheet/Template/Helpers/Xslate.pm
@@ -3,7 +3,6 @@ use strict;
 use warnings;
 
 use JSON;
-use POSIX;
 
 my $JSON = JSON->new;
 
@@ -82,13 +81,13 @@ sub _cell_to_row_col {
 
     my ($col, $row) = $cell =~ /([A-Z]+)([0-9]+)/;
 
-    (my $ncol = $col) =~ tr/A-Z/1-9A-Q/;
-    $ncol = POSIX::strtol($ncol, 27);
-    $ncol -= 1;
+    my $ncol = 0;
+    for my $char (split //, $col) {
+        $ncol *= 26;
+        $ncol += ord($char) - ord('A') + 1;
+    }
 
-    my $nrow = $row - 1;
-
-    return [ $nrow, $ncol ];
+    return [ $row - 1, $ncol - 1 ];
 }
 
 sub _formats {
diff --git a/t/cell-to-row-col.t b/t/cell-to-row-col.t
new file mode 100644
index 0000000..c20432e
--- /dev/null
+++ b/t/cell-to-row-col.t
@@ -0,0 +1,27 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use Test::More;
+
+use Spreadsheet::Template::Helpers::Xslate;
+
+my %tests = (
+    A1    => [0,   0],
+    Z3    => [2,   25],
+    AA5   => [4,   26],
+    IV256 => [255, 255],
+    ZZ10  => [9,   701],
+    AAA8  => [7,   702],
+    XFD22 => [21,  16383],
+);
+
+for my $cell (sort keys %tests) {
+    # XXX not public API, but i'm lazy
+    is_deeply(
+        Spreadsheet::Template::Helpers::Xslate::_cell_to_row_col($cell),
+        $tests{$cell},
+        "correct value for $cell"
+    );
+}
+
+done_testing;