Improve some tests. Add test for qw<>

t/01_basic.t

@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 21;
+use Test::More tests => 24;
 
 use feature::qw_comments;
 
@@ -43,6 +43,9 @@ is(join('|', @a), "a[s]|b|c", "Nesting []");
 @a = qw{ a{s} b c };
 is(join('|', @a), "a{s}|b|c", "Nesting {}");
 
+@a = qw< a<s> b c >;
+is(join('|', @a), "a<s>|b|c", "Nesting <>");
+
 @a = qw!
    a  # Foo!
    b
@@ -60,13 +63,19 @@ is(join('|', @a), "a|b|c", "Nesting delimiter in comments");
 @a = qw( a ) x 3;
 is(join('|', @a), "a|a|a", "qw() still counts as parens for 'x'");
 
-@a = qw( a\b );   is(join('|', @a), "a\\b",  "qw( a\\b )");
-@a = qw( a\\b );  is(join('|', @a), "a\\b",  "qw( a\\\\b )");
-@a = qw( a\(b );  is(join('|', @a), "a(b",   "qw( a\\(b )");
-@a = qw( a\)b );  is(join('|', @a), "a)b",   "qw( a\\)b )");
-@a = qw! a\!b !;  is(join('|', @a), "a!b",   "qw! a\\!b !");
-@a = qw( a\#b );  is(join('|', @a), "a#b",   "qw( a\\#b )");
-@a = qw( a\ b );  is(join('|', @a), "a\\|b", "qw( a\\ b )");
+@a = qw( a\\b );  is(join('|', @a), "a\\b",  "Escape of \"\\\"");
+@a = qw! a\!b !;  is(join('|', @a), "a!b",   "Escape of delimiter");
+@a = qw( a\(b );  is(join('|', @a), "a(b",   "Escape of start delimiter");
+@a = qw( a\)b );  is(join('|', @a), "a)b",   "Escape of end delimiter");
+@a = qw( a\#b );  is(join('|', @a), "a#b",   "Escape of \"#\"");
+@a = qw( a\b );   is(join('|', @a), "a\\b",  "Non-escape of non-meta");
+@a = qw( a\ b );  is(join('|', @a), "a\\|b", "Non-escape of space");
+
+@a = qw(a b c);
+is(join('|', @a), "a|b|c", "Lack of whitespace");
+
+@a = qw();
+is(join('|', @a), "", "Lack of whitespace with empty qw");
 
 @a = qw ( a b c );
 is(join('|', @a), "a|b|c", "Space before start delimiter");

t/04_errors.t

@@ -98,14 +98,14 @@ my @ea;
 
 {
    no feature::qw_comments;
-   eval '@a = qw( a, b ); 1' or die $@;
+   eval '@a = qw( a, b ); 1' or do { my $e = $@; chomp($e); die $e; };
    s/ at (?:(?!\bat\b).)+ line \S+\.\n\z//s for @warnings;
    @ewarnings = @warnings;
    @ea = @a;
    @warnings = ();
 } {   
    use feature::qw_comments;
-   eval '@a = qw( a, b ); 1' or die $@;
+   eval '@a = qw( a, b ); 1' or do { my $e = $@; chomp($e); die $e; };
    s/ at (?:(?!\bat\b).)+ line \S+\.\n\z//s for @warnings;
    ok(0+@warnings, "One comma warning test verification");
    is_deeply(\@warnings, \@ewarnings, "One comma warnings");
@@ -115,14 +115,14 @@ my @ea;
 
 {
    no feature::qw_comments;
-   eval '@a = qw( a, b, ); 1' or die $@;
+   eval '@a = qw( a, b, ); 1' or do { my $e = $@; chomp($e); die $e; };
    s/ at (?:(?!\bat\b).)+ line \S+\.\n\z//s for @warnings;
    @ewarnings = @warnings;
    @ea = @a;
    @warnings = ();
 } {   
    use feature::qw_comments;
-   eval '@a = qw( a, b, ); 1' or die $@;
+   eval '@a = qw( a, b, ); 1' or do { my $e = $@; chomp($e); die $e; };
    s/ at (?:(?!\bat\b).)+ line \S+\.\n\z//s for @warnings;
    ok(0+@warnings, "Two commas warning test verification");
    is_deeply(\@warnings, \@ewarnings, "Two commas warnings");
@@ -132,27 +132,27 @@ my @ea;
 
 {
    no feature::qw_comments;
-   eval 'qw( ); 1' or die $@;
+   eval 'qw( ); 1' or do { my $e = $@; chomp($e); die $e; };
    s/ at (?:(?!\bat\b).)+ line \S+\.\n\z//s for @warnings;
    @ewarnings = @warnings;
    @warnings = ();
 } {   
    use feature::qw_comments;
-   eval 'qw( ); 1' or die $@;
+   eval 'qw( ); 1' or do { my $e = $@; chomp($e); die $e; };
    s/ at (?:(?!\bat\b).)+ line \S+\.\n\z//s for @warnings;
    is_deeply(\@warnings, \@ewarnings, "Zero elements in void context");
    @warnings = ();
 }
 
 {
    no feature::qw_comments;
-   eval 'qw( a ); 1' or die $@;
+   eval 'qw( a ); 1' or do { my $e = $@; chomp($e); die $e; };
    s/ at (?:(?!\bat\b).)+ line \S+\.\n\z//s for @warnings;
    @ewarnings = @warnings;
    @warnings = ();
 } {   
    use feature::qw_comments;
-   eval 'qw( a ); 1' or die $@;
+   eval 'qw( a ); 1' or do { my $e = $@; chomp($e); die $e; };
    s/ at (?:(?!\bat\b).)+ line \S+\.\n\z//s for @warnings;
    ok(0+@warnings, "One element in void context test verification");
    is_deeply(\@warnings, \@ewarnings, "One element in void context");
@@ -161,13 +161,13 @@ my @ea;
 
 {
    no feature::qw_comments;
-   eval 'qw( a b ); 1' or die $@;
+   eval 'qw( a b ); 1' or do { my $e = $@; chomp($e); die $e; };
    s/ at (?:(?!\bat\b).)+ line \S+\.\n\z//s for @warnings;
    @ewarnings = @warnings;
    @warnings = ();
 } {   
    use feature::qw_comments;
-   eval 'qw( a b ); 1' or die $@;
+   eval 'qw( a b ); 1' or do { my $e = $@; chomp($e); die $e; };
    s/ at (?:(?!\bat\b).)+ line \S+\.\n\z//s for @warnings;
    ok(0+@warnings, "Two elements in void context test verification");
    is_deeply(\@warnings, \@ewarnings, "Two elements in void context");