summaryrefslogtreecommitdiff
path: root/t/t4018-diff-funcname.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-05-21 19:38:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-22 05:29:32 (GMT)
commitea2ca4497bdb716977a3e2526780635cb6bac513 (patch)
tree88503ab48c0fa26bdced5e199ca7c0b2653acfae /t/t4018-diff-funcname.sh
parent12f0967a8a1e3c11c678de181f77d1c7883b37cf (diff)
downloadgit-ea2ca4497bdb716977a3e2526780635cb6bac513.zip
git-ea2ca4497bdb716977a3e2526780635cb6bac513.tar.gz
git-ea2ca4497bdb716977a3e2526780635cb6bac513.tar.bz2
userdiff/perl: catch sub with brace on second line
Accept sub foo { } as an alternative to a more common style that introduces perl functions with a brace on the first line (and likewise for BEGIN/END blocks). The new regex is a little hairy to avoid matching # forward declaration sub foo; while continuing to match "sub foo($;@) {" and sub foo { # This routine is interesting; # in fact, the lines below explain how... While at it, pay attention to Perl 5.14's "package foo {" syntax as an alternative to the traditional "package foo;". Requested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4018-diff-funcname.sh')
-rwxr-xr-xt/t4018-diff-funcname.sh25
1 files changed, 23 insertions, 2 deletions
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 8a57149..b2fd1a9 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -35,7 +35,11 @@ package Beer;
use strict;
use warnings;
use parent qw(Exporter);
-our @EXPORT_OK = qw(round);
+our @EXPORT_OK = qw(round finalround);
+
+sub other; # forward declaration
+
+# hello
sub round {
my ($n) = @_;
@@ -46,6 +50,12 @@ sub round {
print "$n bottles of beer on the wall.\n";
}
+sub finalround
+{
+ print "Go to the store, buy some more\n";
+ print "99 bottles of beer on the wall.\n");
+}
+
__END__
=head1 NAME
@@ -54,12 +64,13 @@ Beer - subroutine to output fragment of a drinking song
=head1 SYNOPSIS
- use Beer qw(round);
+ use Beer qw(round finalround);
sub song {
for (my $i = 99; $i > 0; $i--) {
round $i;
}
+ finalround;
}
song;
@@ -67,7 +78,9 @@ Beer - subroutine to output fragment of a drinking song
=cut
EOF
sed -e '
+ s/hello/goodbye/
s/beer\\/beer,\\/
+ s/more\\/more,\\/
s/song;/song();/
' <Beer.perl >Beer-correct.perl
@@ -121,6 +134,10 @@ test_expect_success 'preset perl pattern' '
test_expect_funcname "sub round {\$" perl
'
+test_expect_success 'perl pattern accepts K&R style brace placement, too' '
+ test_expect_funcname "sub finalround\$" perl
+'
+
test_expect_success 'perl pattern is not distracted by sub within POD' '
test_expect_funcname "=head" perl
'
@@ -129,6 +146,10 @@ test_expect_success 'perl pattern gets full line of POD header' '
test_expect_funcname "=head1 SYNOPSIS\$" perl
'
+test_expect_success 'perl pattern is not distracted by forward declaration' '
+ test_expect_funcname "package Beer;\$" perl
+'
+
test_expect_success 'custom pattern' '
test_config diff.java.funcname "!static
!String