- Tidied up Perl solutions to "Zero Matrix" task.

2 files changed, 13 insertions, 23 deletions

diff --git a/challenge-068/mohammad-anwar/perl/ch-1.pl b/challenge-068/mohammad-anwar/perl/ch-1.pl
index 150f59340f..d84eb251a1 100644
--- a/challenge-068/mohammad-anwar/perl/ch-1.pl
+++ b/challenge-068/mohammad-anwar/perl/ch-1.pl
@@ -29,10 +29,10 @@ else {
     ];
 }
 
-my $zero_m = make_zero_matrix($matrix);
+my $zero_matrix = make_zero_matrix($matrix);
 
-print matrix($matrix), "\n";
-print matrix($zero_m), "\n";
+display_matrix('Matrix:', $matrix);
+display_matrix('Zero Matrix:', $zero_matrix);
 
 #
 #
@@ -67,16 +67,6 @@ sub make_zero_matrix {
     return $zero_matrix;
 }
 
-sub matrix {
-    my ($matrix) = @_;
-
-    my $rows = $#$matrix;
-    my $cols = $#{$matrix->[0]};
-    foreach my $r (0..$rows) {
-        print sprintf("[ %s ]\n", join ', ', @{$matrix->[$r]});
-    }
-}
-
 sub get_matrix {
     my ($rows, $cols) = @_;
 
@@ -94,3 +84,13 @@ sub get_matrix {
 
     return $matrix;
 }
+
+sub display_matrix {
+    my ($label, $matrix) = @_;
+
+    print "$label\n";
+    foreach my $r (0..$#$matrix) {
+        print sprintf("[ %s ]\n", join ', ', @{$matrix->[$r]});
+    }
+    print "\n";
+}
diff --git a/challenge-068/mohammad-anwar/perl/ch-1a.pl b/challenge-068/mohammad-anwar/perl/ch-1a.pl
index 7cad9f11f1..530c8e6b34 100644
--- a/challenge-068/mohammad-anwar/perl/ch-1a.pl
+++ b/challenge-068/mohammad-anwar/perl/ch-1a.pl
@@ -56,16 +56,6 @@ sub make_zero_matrix {
     return $zero_matrix;
 }
 
-sub matrix {
-    my ($matrix) = @_;
-
-    my $rows = $#$matrix;
-    my $cols = $#{$matrix->[0]};
-    foreach my $r (0..$rows) {
-        print sprintf("[ %s ]\n", join ', ', @{$matrix->[$r]});
-    }
-}
-
 sub get_matrix {
     my ($rows, $cols) = @_;