summaryrefslogtreecommitdiff
path: root/userdiff.c
diff options
context:
space:
mode:
authorAdrian Johnson <ajohnson@redneon.com>2014-02-03 22:03:16 +1030
committerJunio C Hamano <gitster@pobox.com>2014-02-05 10:45:51 -0800
commit39a87a29ce364ed3337e535adce5973731ba2968 (patch)
tree68e505c177a50f64ba479062f4701832830f59ae /userdiff.c
parent2f93541d88fadd1ff5307d81c2c8921ee3eea058 (diff)
downloadgit-39a87a29ce364ed3337e535adce5973731ba2968.tar.gz
userdiff: update Ada patternsaj/ada-diff-word-pattern
- Allow extra space in "is new" and "is separate" - Fix bug in word regex for numbers Signed-off-by: Adrian Johnson <ajohnson@redneon.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'userdiff.c')
-rw-r--r--userdiff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/userdiff.c b/userdiff.c
index ea43a0306f..10b61ec37d 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -15,13 +15,13 @@ static int drivers_alloc;
word_regex "|[^[:space:]]|[\xc0-\xff][\x80-\xbf]+" }
static struct userdiff_driver builtin_drivers[] = {
IPATTERN("ada",
- "!^(.*[ \t])?(is new|renames|is separate)([ \t].*)?$\n"
+ "!^(.*[ \t])?(is[ \t]+new|renames|is[ \t]+separate)([ \t].*)?$\n"
"!^[ \t]*with[ \t].*$\n"
"^[ \t]*((procedure|function)[ \t]+.*)$\n"
"^[ \t]*((package|protected|task)[ \t]+.*)$",
/* -- */
"[a-zA-Z][a-zA-Z0-9_]*"
- "|[0-9][-+0-9#_.eE]"
+ "|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?"
"|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"),
IPATTERN("fortran",
"!^([C*]|[ \t]*!)\n"