diff options
| author | Georg Brandl <georg@python.org> | 2017-01-17 08:25:28 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2017-01-17 08:25:28 +0100 |
| commit | 94d23ec1b83cd66509e8d16c1ae69f31d2b6013d (patch) | |
| tree | 50b926397ed4b49b771d51aa52c4663fe270873d /pygments/lexers/haskell.py | |
| parent | d410f2237de3b47650f69d4f4f2dae310aa6097e (diff) | |
| parent | 36b8fb2096c234912ed0242a1c76a102d8f0fdc0 (diff) | |
| download | pygments-git-94d23ec1b83cd66509e8d16c1ae69f31d2b6013d.tar.gz | |
Merged in jayvdb/pygments-main (pull request #665)
Provide explanation when a test is skipped
Diffstat (limited to 'pygments/lexers/haskell.py')
| -rw-r--r-- | pygments/lexers/haskell.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pygments/lexers/haskell.py b/pygments/lexers/haskell.py index ffc3a3a2..b85a8d58 100644 --- a/pygments/lexers/haskell.py +++ b/pygments/lexers/haskell.py @@ -39,7 +39,7 @@ class HaskellLexer(RegexLexer): flags = re.MULTILINE | re.UNICODE reserved = ('case', 'class', 'data', 'default', 'deriving', 'do', 'else', - 'if', 'in', 'infix[lr]?', 'instance', + 'family', 'if', 'in', 'infix[lr]?', 'instance', 'let', 'newtype', 'of', 'then', 'type', 'where', '_') ascii = ('NUL', 'SOH', '[SE]TX', 'EOT', 'ENQ', 'ACK', 'BEL', 'BS', 'HT', 'LF', 'VT', 'FF', 'CR', 'S[OI]', 'DLE', @@ -63,6 +63,9 @@ class HaskellLexer(RegexLexer): (r'^[_' + uni.Ll + r'][\w\']*', Name.Function), (r"'?[_" + uni.Ll + r"][\w']*", Name), (r"('')?[" + uni.Lu + r"][\w\']*", Keyword.Type), + (r"(')[" + uni.Lu + r"][\w\']*", Keyword.Type), + (r"(')\[[^\]]*\]", Keyword.Type), # tuples and lists get special treatment in GHC + (r"(')\([^\)]*\)", Keyword.Type), # .. # Operators (r'\\(?![:!#$%&*+.\\/<=>?@^|~-]+)', Name.Function), # lambda operator (r'(<-|::|->|=>|=)(?![:!#$%&*+.\\/<=>?@^|~-]+)', Operator.Word), # specials |