further improvements according to kritika.io

CaballerosTeam · Sep 19, 2017 · 08cfb14 · 08cfb14
1 parent acc190b
commit 08cfb14
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 21 deletions.
diff --git a/src/nsort.c b/src/nsort.c
@@ -31,14 +31,12 @@ int _ncmp(const char *a, const char *b, int reverse, int use_locale) {
     }
 
     if (result == 0) {
-        char *chunk_a;
-        char *chunk_b;
         int chunk_a_int;
         int chunk_b_int;
 
         while (offset_a != len_a && offset_b != len_b) {
-            chunk_a = get_next_chunk(a, &offset_a, &is_digit_a);
-            chunk_b = get_next_chunk(b, &offset_b, &is_digit_b);
+            char *chunk_a = get_next_chunk(a, &offset_a, &is_digit_a);
+            char *chunk_b = get_next_chunk(b, &offset_b, &is_digit_b);
             bool is_last_chunk_a_digit = !is_digit_a;
             bool is_last_chunk_b_digit = !is_digit_b;
 

diff --git a/t/Sort-Naturally-XS-ncmp.t b/t/Sort-Naturally-XS-ncmp.t
@@ -4,11 +4,11 @@ use Test::More;
 use Encode;
 use Sort::Naturally::XS;
 
-my $ar_wo_digit = [reverse(map $_ x 2, ('a'..'z'))];
+my $ar_wo_digit = [reverse(map {$_ x 2} ('a'..'z'))];
 my $ar_wo_digit__expected = [reverse(@{$ar_wo_digit})];
 ok(eq_array($ar_wo_digit__expected, [sort {ncmp($a, $b)} @{$ar_wo_digit}]), 'Char only sort');
 
-my $ar_digit = [reverse(map $_ x 2, (1..10))];
+my $ar_digit = [reverse(map {$_ x 2} (1..10))];
 my $ar_digit__expected = [reverse(@{$ar_digit})];
 ok(eq_array($ar_digit__expected, [sort {ncmp($a, $b)} @{$ar_digit}]), 'Digit only sort');
 
@@ -45,13 +45,9 @@ my $ar_mixed_utf8__expected = [qw/CH-53E CH-53K S-47 S-55 Ка-2 Ка-8 Ка-10
 ok(eq_array($ar_mixed_utf8__expected, [sort {ncmp($a, $b)} @{$ar_mixed_utf8}]), 'UTF-8 test');
 
 # windows-1251 test
-my $ar_mixed_cp1251 = [map {Encode::from_to($_, 'utf8', 'cp1251'); $_;} @{$ar_mixed_utf8}];
-my $ar_mixed_cp1251__expected = [map {Encode::from_to($_, 'utf8', 'cp1251'); $_;} @{$ar_mixed_utf8__expected}];
+my $ar_mixed_cp1251 = [map {Encode::encode('cp1251', Encode::decode('utf8', $_))} @{$ar_mixed_utf8}];
+my $ar_mixed_cp1251__expected =
+    [map {Encode::encode('cp1251', Encode::decode('utf8', $_))} @{$ar_mixed_utf8__expected}];
 ok(eq_array($ar_mixed_cp1251__expected, [sort {ncmp($a, $b)} @{$ar_mixed_cp1251}]), 'WINDOWS-1251 test');
 
-# locale test
-#my $ar_local = [qw/и й е ё/];
-#my $ar_local__expected = [qw/е ё и й/];
-#ok(eq_array($ar_local__expected, [sort ncmp @{$ar_local}]), 'Locale support');
-
 done_testing();
diff --git a/t/Sort-Naturally-XS-nsort.t b/t/Sort-Naturally-XS-nsort.t
@@ -4,11 +4,11 @@ use Test::More;
 use Encode;
 use Sort::Naturally::XS;
 
-my $ar_wo_digit = [reverse(map $_ x 2, ('a'..'z'))];
+my $ar_wo_digit = [reverse(map {$_ x 2} ('a'..'z'))];
 my $ar_wo_digit__expected = [reverse(@{$ar_wo_digit})];
 ok(eq_array($ar_wo_digit__expected, [nsort(@{$ar_wo_digit})]), 'Char only sort');
 
-my $ar_digit = [reverse(map $_ x 2, (1..10))];
+my $ar_digit = [reverse(map {$_ x 2} (1..10))];
 my $ar_digit__expected = [reverse(@{$ar_digit})];
 ok(eq_array($ar_digit__expected, [nsort(@{$ar_digit})]), 'Digit only sort');
 
@@ -44,8 +44,9 @@ my $ar_mixed_utf8__expected = [qw/Ка-8 Ка-10 Ка-15 Ка-18 Ка-22 Ка-25
     Ми-8 Ми-10 Ми-14 Ми-20 Ми-24 Ми-26 Ми-30 Ми-171 Як-24 Як-60 Як-100/];
 ok(eq_array($ar_mixed_utf8__expected, [nsort(@{$ar_mixed_utf8})]), 'UTF-8 test');
 
-my $ar_mixed_cp1251 = [map {Encode::from_to($_, 'utf8', 'cp1251'); $_;} @{$ar_mixed_utf8}];
-my $ar_mixed_cp1251__expected = [map {Encode::from_to($_, 'utf8', 'cp1251'); $_;} @{$ar_mixed_utf8__expected}];
+my $ar_mixed_cp1251 = [map {Encode::encode('cp1251', Encode::decode('utf8', $_))} @{$ar_mixed_utf8}];
+my $ar_mixed_cp1251__expected =
+    [map {Encode::encode('cp1251', Encode::decode('utf8', $_))} @{$ar_mixed_utf8__expected}];
 ok(eq_array($ar_mixed_cp1251__expected, [nsort(@{$ar_mixed_cp1251})]), 'WINDOWS-1251 test');
 
 done_testing();
diff --git a/t/Sort-Naturally-XS-sorted.t b/t/Sort-Naturally-XS-sorted.t
@@ -11,11 +11,11 @@ my $locale_skip = {
     darwin => 'MacOS',
 };
 
-my $ar_wo_digit = [reverse(map $_ x 2, ('a'..'z'))];
+my $ar_wo_digit = [reverse(map {$_ x 2} ('a'..'z'))];
 my $ar_wo_digit__expected = [reverse(@{$ar_wo_digit})];
 ok(eq_array($ar_wo_digit__expected, sorted($ar_wo_digit)), 'Char only sort');
 
-my $ar_digit = [reverse(map $_ x 2, (1..10))];
+my $ar_digit = [reverse(map {$_ x 2} (1..10))];
 my $ar_digit__expected = [reverse(@{$ar_digit})];
 ok(eq_array($ar_digit__expected, sorted($ar_digit)), 'Digit only sort');
 
@@ -51,8 +51,9 @@ my $ar_mixed_utf8__expected = [qw/Ка-8 Ка-10 Ка-15 Ка-18 Ка-22 Ка-25
     Ми-8 Ми-10 Ми-14 Ми-20 Ми-24 Ми-26 Ми-30 Ми-171 Як-24 Як-60 Як-100/];
 ok(eq_array($ar_mixed_utf8__expected, sorted($ar_mixed_utf8)), 'UTF-8 test');
 
-my $ar_mixed_cp1251 = [map {Encode::from_to($_, 'utf8', 'cp1251'); $_;} @{$ar_mixed_utf8}];
-my $ar_mixed_cp1251__expected = [map {Encode::from_to($_, 'utf8', 'cp1251'); $_;} @{$ar_mixed_utf8__expected}];
+my $ar_mixed_cp1251 = [map {Encode::encode('cp1251', Encode::decode('utf8', $_))} @{$ar_mixed_utf8}];
+my $ar_mixed_cp1251__expected =
+    [map {Encode::encode('cp1251', Encode::decode('utf8', $_))} @{$ar_mixed_utf8__expected}];
 ok(eq_array($ar_mixed_cp1251__expected, sorted($ar_mixed_cp1251)), 'WINDOWS-1251 test');
 
 # reverse test