Commit the changes to the normalization test-gen.p6

Author: samcv

S15-normalization/test-gen.p6

@@ -2,6 +2,8 @@ constant MAX_TESTS_PER_FILE    = 2000;
 constant NUM_SANITY_TESTS      = 500;
 constant SANITY_IDENTITY_RATIO = 3;
 my $uni-version;
+my Str:D $NFC-concat-tests = '';
+my Int:D $NFC-concat-tests-number = 0;
 sub MAIN(Str $unidata-normalization-tests) {
     # Parse the normalization test data.
     my @targets = my ($source, $nfc, $nfd, $nfkc, $nfkd) = [] xx 5;
@@ -20,6 +22,12 @@ sub MAIN(Str $unidata-normalization-tests) {
     write-test-files('S15-normalization/nfd', 'NFD', $source, $nfd);
     write-test-files('S15-normalization/nfkc', 'NFKC', $source, $nfkc);
     write-test-files('S15-normalization/nfkd', 'NFKD', $source, $nfkd);
+    my $NFC-concat-target = 'S15-normalization/nfc-concat.t';
+    $NFC-concat-target.IO.spurt(
+        make-header($uni-version, $NFC-concat-tests-number)
+        ~ "\n" ~ 'my @list; my @result;' ~ "\n"
+        ~ $NFC-concat-tests
+    ) and say "Wrote $NFC-concat-target";
 }
 
 sub write-test-files($template, $method, @source, @expected) {
@@ -30,49 +38,51 @@ sub write-test-files($template, $method, @source, @expected) {
     }
     write-sanity-test-file($template ~ "-sanity.t", $method, @source, @expected);
 }
+sub make-header (Str:D $uni-version, Int:D $plan) {
+    qq:to/HEADER/;
+    use v6;
+    # Unicode normalization tests, generated from NormalizationTests.txt in the
+    # Unicode database by S15-normalization/test-gen.p6.
+    # Generated from Unicode version $uni-version.
 
-sub write-test-file($target, $method, @source, @expected) {
-    my $NFC-concat-tests;
-    given open($target, :w) {
-        my $header = qq:to/HEADER/;
-use v6;
-# Unicode normalization tests, generated from NormalizationTests.txt in the
-# Unicode database by S15-normalization/test-gen.p6.
-# Generated from Unicode version $uni-version.
+    use Test;
 
-use Test;
+    plan $plan;
+    HEADER
+}
 
-plan {@source.elems};
-HEADER
-    .say: $header;
-        if $method eq 'NFC' {
-            $NFC-concat-tests ~= $header ~ "\n";
-            $NFC-concat-tests ~= 'my @list; my @result;' ~ "\n";
-        }
+sub write-test-file($target, $method, @source, @expected) {
+    my @last-list;
+    my @last-result;
+    given open($target, :w) {
+        my $header = make-header($uni-version, @source.elems);
+        .say: $header;
         for flat @source Z @expected -> $s, $e {
             .say: "ok Uni.new(&hexy($s)).$method.list ~~ (&hexy($e),), '$s -> $e';";
             if $method eq 'NFC' {
                 my @list = hexy-unjoined($s);
-                my $list-joined = @list.join(', ');
-                my $result-joined = &hexy($e);
-                $NFC-concat-tests ~= "\@list = $list-joined; \@result = $result-joined; \n";
-                $NFC-concat-tests ~= (
-                    "ok all(((Uni.new("
-                    ~ '@list[0..($_ - 1)]'
-                    ~ ') ~ Uni.new('
-                    ~ '@list[$_..*]'
-                ~ ")).$method.list ~~ \@result " ~ "for 1..(\@list-1))), '$s -> $e CONCAT';\n"
-                );
+                my @result = &hexy-unjoined($e);
+                my $list-joined;
+                my $result-joined;
+                my $is-synthetic = False;
+                # Only if there's at least two codepoints add it to the concat
+                # test file
+                if 1 < @list.elems {
+                    $list-joined   = @list.join(', ');
+                    $result-joined = @result.join(', ');
+                    $NFC-concat-tests-number++;
+                    $NFC-concat-tests ~= "\@list = $list-joined; \@result = $result-joined; \n";
+                    $NFC-concat-tests ~= (
+                        "ok all(((Uni.new(\@list[0..(\$_ - 1)]) ~ Uni.new(\@list[\$_..*]"
+                       ~ ")).$method.list ~~ \@result for 1..(\@list-1))), "
+                       ~ "'$list-joined -> $result-joined CONCAT';\n"
+                    );
+                }
             }
         }
 
         .close;
     }
-    if $method eq 'NFC' {
-        my $NFC-concat-target = $target.subst(/'nfc'(<[\S]-[/]>+'.t')/, {"nfc-concat$0"});
-        $NFC-concat-target.IO.spurt($NFC-concat-tests);
-        say "Wrote $NFC-concat-target";
-    }
 
     say "Wrote $target";
 }