index: build UPDATE after git commits

[sheet.git] / browser.plp

diff --git a/browser.plp b/browser.plp
index 06e55e543c7ba0f86ae002b265152f0684cd870e..a100bcb3923a6b4f69f3c597e1f054620412beaa 100644 (file)
--- a/browser.plp
+++ b/browser.plp
@@ -1,10 +1,9 @@
 <(common.inc.plp)><:
 use List::Util qw(sum max first);
-no if $] >= 5.018, warnings => 'experimental::smartmatch';
 
 Html({
        title => 'browser compatibility cheat sheet',
-       version => '1.5',
+       version => '1.6',
        description => [
                "Compatibility table of new web features (HTML5, CSS3, SVG, Javascript)",
                "comparing support and usage share for all popular browser versions.",
@@ -14,13 +13,12 @@ Html({
                html html5 css css3 svg javascript js dom mobile
                ie internet explorer firefox chrome safari webkit opera
        '],
-       stylesheet => [qw'circus dark mono red light'],
        data => ['data/browser/support.inc.pl'],
 });
 
 say "<h1>Browser compatibility</h1>\n";
 
-my $caniuse = do 'data/browser/support.inc.pl' or die $@ || $!;
+my $caniuse = Data('data/browser/support');
 
 my %CSTATS = (
        'n'   => 'l1',
@@ -84,19 +82,19 @@ say '<p id="intro">Alternate rendition of '.$ref;
 
 my ($canihas, $usage);
 my $minusage = $get{threshold} // 1;
-given ($get{usage} // 'wm') {
-       when (!$_) {
-               # none
-       }
-       when (!m{ \A [a-z]\w+ (?:/\d[\d-]*\d)? \z }x) {
+for ($get{usage} // 'wm') {
+       $_ or next;  # none
+       unless (m{ \A [a-z]\w+ (?:/\d[\d-]*\d)? \z }x) {
                Alert([
                        'Invalid browser usage data request',
                        'Identifier must be alphanumeric name or <q>0</q>.',
                ]);
+               next;
        }
-       $canihas = do "data/browser/usage-$_.inc.pl" or do {
-               Alert('Browser usage data not found', $@ || $!);
-               break;
+
+       $canihas = eval { Data("data/browser/usage-$_") } or do {
+               Alert('Browser usage data not found', ref $@ ? @{$@} : $@);
+               next;
        };
        $usage = $_;
        my $ref = $canihas->{-title} || 'unknown';
@@ -392,7 +390,7 @@ sub saybrowsercols {
                        // $prev                     # inherit from predecessor
                        || 'u'                       # unsure
                );
-               if (defined $prev and not $prev ~~ $compare) {
+               if (defined $prev and not (defined $compare and $prev eq $compare)) {
                        # different columns
                        my @vercover = (map { @{$_} } @span);  # accumulated conforming versions
                        for ($ver ? @{$ver} : ()) {