Merge branch 'as/userdiff-pascal'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Jan 2011 18:54:12 +0000 (10:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Jan 2011 18:54:12 +0000 (10:54 -0800)
* as/userdiff-pascal:
userdiff: match Pascal class methods

1  2 
userdiff.c
diff --combined userdiff.c
index c384b39e4daf1226a2c13c74dc2a4a2f75b8e63b,234697821d3f0aa285c18903fe8c465cadf071b7..9ebf231ea5ee2e7fd1f71c9557a6537d29428d8d
@@@ -52,7 -52,7 +52,7 @@@ PATTERNS("objc"
         "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"
         "|[^[:space:]]|[\x80-\xff]+"),
  PATTERNS("pascal",
-        "^((procedure|function|constructor|destructor|interface|"
+        "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface|"
                "implementation|initialization|finalization)[ \t]*.*)$"
         "\n"
         "^(.*=[ \t]*(class|record).*)$",
         "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"
         "|<>|<=|>=|:=|\\.\\."
         "|[^[:space:]]|[\x80-\xff]+"),
 +PATTERNS("perl",
 +       "^[ \t]*package .*;\n"
 +       "^[ \t]*sub .* \\{\n"
 +       "^[A-Z]+ \\{\n"        /* BEGIN, END, ... */
 +       "^=head[0-9] ",        /* POD */
 +       /* -- */
 +       "[[:alpha:]_'][[:alnum:]_']*"
 +       "|0[xb]?[0-9a-fA-F_]*"
 +       /* taking care not to interpret 3..5 as (3.)(.5) */
 +       "|[0-9a-fA-F_]+(\\.[0-9a-fA-F_]+)?([eE][-+]?[0-9_]+)?"
 +       "|=>|-[rwxoRWXOezsfdlpSugkbctTBMAC>]|~~|::"
 +       "|&&=|\\|\\|=|//=|\\*\\*="
 +       "|&&|\\|\\||//|\\+\\+|--|\\*\\*|\\.\\.\\.?"
 +       "|[-+*/%.^&<>=!|]="
 +       "|=~|!~"
 +       "|<<|<>|<=>|>>"
 +       "|[^[:space:]]"),
  PATTERNS("php",
         "^[\t ]*(((public|protected|private|static)[\t ]+)*function.*)$\n"
         "^[\t ]*(class.*)$",