author | Junio C Hamano <gitster@pobox.com> | |
Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 10 Feb 2011 00:41:17 +0000 (16:41 -0800) |
* tr/diff-words-test:
t4034 (diff --word-diff): add a minimum Perl drier test vector
t4034 (diff --word-diff): style suggestions
userdiff: simplify word-diff safeguard
t4034: bulk verify builtin word regex sanity
t4034 (diff --word-diff): add a minimum Perl drier test vector
t4034 (diff --word-diff): style suggestions
userdiff: simplify word-diff safeguard
t4034: bulk verify builtin word regex sanity
1 | 2 | |||
---|---|---|---|---|
userdiff.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc userdiff.c
index 9ebf231ea5ee2e7fd1f71c9557a6537d29428d8d,3a1c392bbd76b167847f7a3b164f0135eb66740e..1ff47977d549992ada8c1236187d4516b648ee7d
--- 1/userdiff.c
--- 2/userdiff.c
+++ b/userdiff.c
/* -- */
"[a-zA-Z_][a-zA-Z0-9_]*"
"|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
- "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"
- "|[^[:space:]]|[\x80-\xff]+"),
+ "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
PATTERNS("pascal",
- "^((procedure|function|constructor|destructor|interface|"
+ "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface|"
"implementation|initialization|finalization)[ \t]*.*)$"
"\n"
"^(.*=[ \t]*(class|record).*)$",