mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'aj/ada-diff-word-pattern'
* aj/ada-diff-word-pattern: userdiff: update Ada patterns
This commit is contained in:
commit
c256661bbe
|
@ -4,7 +4,7 @@
|
|||
<BOLD>+++ b/post<RESET>
|
||||
<CYAN>@@ -1,13 +1,13 @@<RESET>
|
||||
Ada.Text_IO.Put_Line("Hello World<RED>!<RESET><GREEN>?<RESET>");
|
||||
1 1e<RED>-<RESET>10 16#FE12#E2 3.141_592 '<RED>x<RESET><GREEN>y<RESET>'
|
||||
1 <RED>1e-10<RESET><GREEN>1e10<RESET> 16#FE12#E2 3.141_592 '<RED>x<RESET><GREEN>y<RESET>'
|
||||
<RED>a<RESET><GREEN>x<RESET>+<RED>b a<RESET><GREEN>y x<RESET>-<RED>b<RESET>
|
||||
<RED>a<RESET><GREEN>y<RESET>
|
||||
<GREEN>x<RESET>*<RED>b a<RESET><GREEN>y x<RESET>/<RED>b<RESET>
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue