diff options
| author | Gaurav Jain <gaurav@gauravjain.org> | 2014-05-15 22:57:54 -0400 |
|---|---|---|
| committer | Gaurav Jain <gaurav@gauravjain.org> | 2014-05-15 22:57:54 -0400 |
| commit | 455118b5ccd5538b727daec1b6b8e7b5ee85ef22 (patch) | |
| tree | fc12d4b1b57eefe59b21e5e5fa8f9e76964ccd1b /pygments | |
| parent | 4eb6e4dd67d57197d3a077cf4aeca6736ef85d5b (diff) | |
| download | pygments-455118b5ccd5538b727daec1b6b8e7b5ee85ef22.tar.gz | |
Overlap in character class
Diffstat (limited to 'pygments')
| -rw-r--r-- | pygments/lexers/functional.py | 2 | ||||
| -rw-r--r-- | pygments/lexers/other.py | 2 | ||||
| -rw-r--r-- | pygments/lexers/web.py | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/pygments/lexers/functional.py b/pygments/lexers/functional.py index 1f9d816e..497f024d 100644 --- a/pygments/lexers/functional.py +++ b/pygments/lexers/functional.py @@ -2679,7 +2679,7 @@ class ElixirLexer(RegexLexer): (r':"', String.Symbol, 'interpoling_symbol'), (r'\b(nil|true|false)\b(?![?!])|\b[A-Z]\w*\b', Name.Constant), (r'\b(__(FILE|LINE|MODULE|MAIN|FUNCTION)__)\b(?![?!])', Name.Builtin.Pseudo), - (r'[a-zA-Z_!][\w_]*[!\?]?', Name), + (r'[a-zA-Z_!]\w*[!\?]?', Name), (r'[(){};,/\|:\\\[\]]', Punctuation), (r'@[a-zA-Z_]\w*|&\d', Name.Variable), (r'\b(0[xX][0-9A-Fa-f]+|\d(_?\d)*(\.(?![^\d\s])' diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py index 5bb60560..b7672fda 100644 --- a/pygments/lexers/other.py +++ b/pygments/lexers/other.py @@ -1619,7 +1619,7 @@ class ABAPLexer(RegexLexer): (r'\".*?\n', Comment.Single), ], 'variable-names': [ - (r'<[\S_]+>', Name.Variable), + (r'<\S+>', Name.Variable), (r'\w[\w~]*(?:(\[\])|->\*)?', Name.Variable), ], 'root': [ diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py index 3a831b06..7fff75dd 100644 --- a/pygments/lexers/web.py +++ b/pygments/lexers/web.py @@ -4285,8 +4285,8 @@ class MaskLexer(RegexLexer): (r'"', String, 'string-double'), (r'([\w-]+)', Name.Tag, 'node'), (r'([^\.#;{>\s]+)', Name.Class, 'node'), - (r'(#[\w_-]+)', Name.Function, 'node'), - (r'(\.[\w_-]+)', Name.Variable.Class, 'node') + (r'(#[\w-]+)', Name.Function, 'node'), + (r'(\.[\w-]+)', Name.Variable.Class, 'node') ], 'string-base': [ (r'\\.', String.Escape), @@ -4323,8 +4323,8 @@ class MaskLexer(RegexLexer): (r'\.', Name.Variable.Class, 'node-class'), (r'\#', Name.Function, 'node-id'), (r'style[ \t]*=', Name.Attribute, 'node-attr-style-value'), - (r'[\w_:-]+[ \t]*=', Name.Attribute, 'node-attr-value'), - (r'[\w_:-]+', Name.Attribute), + (r'[\w:-]+[ \t]*=', Name.Attribute, 'node-attr-value'), + (r'[\w:-]+', Name.Attribute), (r'[>{;]', Punctuation, '#pop') ], 'node-class': [ @@ -4339,7 +4339,7 @@ class MaskLexer(RegexLexer): ], 'node-attr-value':[ (r'\s+', Text), - (r'[\w_]+', Name.Variable, '#pop'), + (r'\w+', Name.Variable, '#pop'), (r"'", String, 'string-single-pop2'), (r'"', String, 'string-double-pop2'), (r'', Text, '#pop') @@ -4353,7 +4353,7 @@ class MaskLexer(RegexLexer): 'css-base': [ (r'\s+', Text), (r";", Punctuation), - (r"[\w\-_]+\s*:", Name.Builtin) + (r"[\w\-]+\s*:", Name.Builtin) ], 'css-single-end': [ include('css-base'), |