diff options
-rw-r--r-- | git.git-authors | 2 | ||||
-rw-r--r-- | src/userdiff.h | 26 |
2 files changed, 28 insertions, 0 deletions
diff --git a/git.git-authors b/git.git-authors index 9620844a9..7e53d66a9 100644 --- a/git.git-authors +++ b/git.git-authors @@ -40,6 +40,7 @@ # ok Adam Simpkins <adam@adamsimpkins.net> (http transport) ok Adrian Johnson <ajohnson@redneon.com> +ok Alexey Shumkin <alex.crezoff@gmail.com> ok Andreas Ericsson <ae@op5.se> ok Boyd Lynn Gerber <gerberb@zenez.com> ok Brandon Casey <drafnel@gmail.com> @@ -64,6 +65,7 @@ ok Nicolas Pitre <nico@fluxnic.net> <nico@cam.org> ok Paolo Bonzini <bonzini@gnu.org> ok Paul Kocher <paul@cryptography.com> ok Peter Hagervall <hager@cs.umu.se> +ok Petr Onderka <gsvick@gmail.com> ok Pierre Habouzit <madcoder@debian.org> ok Pieter de Bie <pdebie@ai.rug.nl> ok René Scharfe <rene.scharfe@lsrfire.ath.cx> diff --git a/src/userdiff.h b/src/userdiff.h index a4f3686ad..1f2318507 100644 --- a/src/userdiff.h +++ b/src/userdiff.h @@ -94,6 +94,16 @@ PATTERNS("objc", "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), +PATTERNS("pascal", + "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface|" + "implementation|initialization|finalization)[ \t]*.*)$" + "\n" + "^(.*=[ \t]*(class|record).*)$", + /* -- */ + "[a-zA-Z_][a-zA-Z0-9_]*" + "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+" + "|<>|<=|>=|:=|\\.\\."), + PATTERNS("perl", "^package .*\n" "^sub [[:alnum:]_':]+[ \t]*" @@ -154,6 +164,22 @@ PATTERNS("cpp", "[a-zA-Z_][a-zA-Z0-9_]*" "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?" "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), + +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]?" + "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"), }; #undef IPATTERN |