diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:20:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-21 23:20:51 -0700 |
| commit | a0b6a9d2b2b0667bc170c864a05b3ec4635a71bb (patch) | |
| tree | 1767f40391f3440d8b6e9ffb39976bec6fb707c8 /userdiff.c | |
| parent | Merge branch 'ab/perl-install' (diff) | |
| parent | Userdiff patterns for C# (diff) | |
| download | git-a0b6a9d2b2b0667bc170c864a05b3ec4635a71bb.tar.gz git-a0b6a9d2b2b0667bc170c864a05b3ec4635a71bb.zip | |
Merge branch 'po/userdiff-csharp'
* po/userdiff-csharp:
Userdiff patterns for C#
Diffstat (limited to 'userdiff.c')
| -rw-r--r-- | userdiff.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/userdiff.c b/userdiff.c index c49cc1b67e..e5522159b3 100644 --- a/userdiff.c +++ b/userdiff.c @@ -82,6 +82,22 @@ PATTERNS("cpp", "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->" "|[^[:space:]]|[\x80-\xff]+"), +PATTERNS("csharp", + /* Keywords */ + "!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n" + /* Methods and constructors */ + "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[<>@._[:alnum:]]+[ \t]*\\(.*\\))[ \t]*$\n" + /* Properties */ + "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[@._[:alnum:]]+)[ \t]*$\n" + /* Type definitions */ + "^[ \t]*(((static|public|internal|private|protected|new|unsafe|sealed|abstract|partial)[ \t]+)*(class|enum|interface|struct)[ \t]+.*)$\n" + /* Namespace */ + "^[ \t]*(namespace[ \t]+.*)$", + /* -- */ + "[a-zA-Z_][a-zA-Z0-9_]*" + "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" + "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->" + "|[^[:space:]]|[\x80-\xff]+"), { "default", NULL, -1, { NULL, 0 } }, }; #undef PATTERNS |