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/asm.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/asm.py')
| -rw-r--r-- | pygments/lexers/asm.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py index 2bb3eac9..4c58e54b 100644 --- a/pygments/lexers/asm.py +++ b/pygments/lexers/asm.py @@ -54,8 +54,6 @@ class GasLexer(RegexLexer): (number, Number.Integer), (r'[\r\n]+', Text, '#pop'), - (r'#.*?$', Comment, '#pop'), - include('punctuation'), include('whitespace') ], @@ -78,14 +76,14 @@ class GasLexer(RegexLexer): ('$'+number, Number.Integer), (r"$'(.|\\')'", String.Char), (r'[\r\n]+', Text, '#pop'), - (r'#.*?$', Comment, '#pop'), + include('punctuation'), include('whitespace') ], 'whitespace': [ (r'\n', Text), (r'\s+', Text), - (r'#.*?\n', Comment) + (r'[;#].*?\n', Comment) ], 'punctuation': [ (r'[-*,.()\[\]!:]+', Punctuation) |