diff options
| author | Tim Hatch <tim@timhatch.com> | 2014-05-17 09:19:35 -0700 |
|---|---|---|
| committer | Tim Hatch <tim@timhatch.com> | 2014-05-17 09:19:35 -0700 |
| commit | a62cdcfaa5a260274303cb93b92a3f2e2ce3be98 (patch) | |
| tree | e7d2b4cd4e10a6e43fe4b2dc4e03ab2e827ebc20 /pygments/lexers/asm.py | |
| parent | 70a10a2e423d9729b62c7b56faca28889c0d688a (diff) | |
| parent | ff12540907fe9d98bf02c9508a171659457b14b2 (diff) | |
| download | pygments-a62cdcfaa5a260274303cb93b92a3f2e2ce3be98.tar.gz | |
Merged in timgilbert/pygments-main/clj-keyword-fix (pull request #326)
Tweaking clojure keyword lexing
Diffstat (limited to 'pygments/lexers/asm.py')
| -rw-r--r-- | pygments/lexers/asm.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py index fc361e2f..35092f52 100644 --- a/pygments/lexers/asm.py +++ b/pygments/lexers/asm.py @@ -318,8 +318,8 @@ class NasmLexer(RegexLexer): filenames = ['*.asm', '*.ASM'] mimetypes = ['text/x-nasm'] - identifier = r'[a-zA-Z$._?][a-zA-Z0-9$._?#@~]*' - hexn = r'(?:0[xX][0-9a-fA-F]+|$0[0-9a-fA-F]*|[0-9]+[0-9a-fA-F]*h)' + identifier = r'[a-z$._?][\w$.?#@~]*' + hexn = r'(?:0[xX][0-9a-f]+|$0[0-9a-f]*|[0-9]+[0-9a-f]*h)' octn = r'[0-7]+q' binn = r'[01]+b' decn = r'[0-9]+' @@ -417,7 +417,7 @@ class Ca65Lexer(RegexLexer): r'|cl[cvdi]|se[cdi]|jmp|jsr|bne|beq|bpl|bmi|bvc|bvs|bcc|bcs' r'|p[lh][ap]|rt[is]|brk|nop|ta[xy]|t[xy]a|txs|tsx|and|ora|eor' r'|bit)\b', Keyword), - (r'\.[a-z0-9_]+', Keyword.Pseudo), + (r'\.\w+', Keyword.Pseudo), (r'[-+~*/^&|!<>=]', Operator), (r'"[^"\n]*.', String), (r"'[^'\n]*.", String.Char), |