charset: inline request build

[sheet.git] / charset.plp

diff --git a/charset.plp b/charset.plp
index 7794284f7ff685f4db1f6ef2279a249841dfc76b..8b42e62dbdb9f7f4db9e64e381bb15667041a1e0 100644 (file)
--- a/charset.plp
+++ b/charset.plp
@@ -24,6 +24,7 @@ my @tablist = split /[^\w-]+/, $Request || 'default';
 use POSIX qw( ceil );
 use Shiar_Sheet::FormatChar;
 my $glyphs = Shiar_Sheet::FormatChar->new;
+my @request;
 
 sub tabinput {
        # generate character table(s)
@@ -59,7 +60,8 @@ sub tabinput {
                11 => 'thai',
        };
        if (my $follow = $ALIAS->{$input}) {
-               return map { tabinput($_) } ref $follow ? @{$follow} : $follow;
+               tabinput($_) for ref $follow ? @{$follow} : $follow;
+               return;
        }
 
        my %row = (offset => 0, cols => 16);
@@ -122,9 +124,9 @@ sub tabinput {
                Alert("Encoding <q>$input</q> unknown");
                return;
        }
-       return \%row;
+       push @request, \%row;
 }
-my @request = map { tabinput($_) } @tablist;
+tabinput($_) for @tablist;
 
 my $NOCHAR = chr 0xFFFD;