t4018-diff-funcname: test syntax of builtin xfuncname patterns

drafnel · gitster · commit fdac6692a0b0 · 2008-09-23T01:48:49.000-07:00
[jc: fixes bibtex pattern breakage exposed by this test]

Signed-off-by: Brandon Casey &lt;casey@nrlssc.navy.mil&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/diff.c b/diff.c
@@ -1404,7 +1404,7 @@ static const struct funcname_pattern_entry *funcname_pattern(const char *ident)
 }
 
 static const struct funcname_pattern_entry builtin_funcname_pattern[] = {
-	{ "bibtex", "(@[a-zA-Z]{1,}[ \t]*\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
+	{ "bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
 	  REG_EXTENDED },
 	{ "html", "^[ \t]*(<[Hh][1-6][ \t].*>.*)$", REG_EXTENDED },
 	{ "java",
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
@@ -32,7 +32,7 @@ EOF
 
 sed 's/beer\\/beer,\\/' < Beer.java > Beer-correct.java
 
-builtin_patterns="bibtex java pascal ruby tex"
+builtin_patterns="bibtex html java pascal php python ruby tex"
 for p in $builtin_patterns
 do
 	test_expect_success "builtin $p pattern compiles" '

Original file line number	Diff line number	Diff line change
`@@ -1404,7 +1404,7 @@ static const struct funcname_pattern_entry funcname_pattern(const char ident)`
`1404`	`1404`	`}`
`1405`	`1405`
`1406`	`1406`	`static const struct funcname_pattern_entry builtin_funcname_pattern[] = {`
`1407`		`- { "bibtex", "(@[a-zA-Z]{1,}[ \t]\{{0,1}[ \t][^ \t\"@',\\#}{~%]).$",`
	`1407`	`+ { "bibtex", "(@[a-zA-Z]{1,}[ \t]\\{{0,1}[ \t][^ \t\"@',\\#}{~%]).$",`
`1408`	`1408`	`REG_EXTENDED },`
`1409`	`1409`	`{ "html", "^[ \t](<[Hh][1-6][ \t].>.*)$", REG_EXTENDED },`
`1410`	`1410`	`{ "java",`