diff options
| author | Vicent Marti <vicent@github.com> | 2014-04-09 12:08:30 +0200 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-04-09 12:08:30 +0200 |
| commit | 3ed8d00cc87f671ab060b985e7597efbb5de8c91 (patch) | |
| tree | 49e39f29169b71e0add64dbceb2e92a7ed2a8263 | |
| parent | ce2e82694a19b9994acaa9376bff81bc8e968637 (diff) | |
| parent | 9ce60fadda2a333756523299bff7772d05e69457 (diff) | |
| download | libgit2-3ed8d00cc87f671ab060b985e7597efbb5de8c91.tar.gz | |
Merge pull request #2258 from libgit2/jk/userdiff-cc
pull userdiff pattern updates from git.git
| -rw-r--r-- | src/userdiff.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/userdiff.h b/src/userdiff.h index 7eb095246..523f2f8d4 100644 --- a/src/userdiff.h +++ b/src/userdiff.h @@ -45,13 +45,13 @@ typedef struct { static git_diff_driver_definition builtin_defs[] = { 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", @@ -159,15 +159,13 @@ PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$", PATTERNS("cpp", /* Jump targets or access declarations */ - "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:.*$\n" - /* C/++ functions/methods at top level */ - "^([A-Za-z_][A-Za-z_0-9]*([ \t*]+[A-Za-z_][A-Za-z_0-9]*([ \t]*::[ \t]*[^[:space:]]+)?){1,}[ \t]*\\([^;]*)$\n" - /* compound type at top level */ - "^((struct|class|enum)[^;]*)$", + "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:[[:space:]]*($|/[/*])\n" + /* functions/methods, variables, and compounds at top level */ + "^((::[[:space:]]*)?[A-Za-z_].*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" - "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" - "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), + "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lLuU]*" + "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"), PATTERNS("csharp", /* Keywords */ |