summaryrefslogtreecommitdiff
path: root/pygments/lexers/asm.py
diff options
context:
space:
mode:
authorTim Hatch <tim@timhatch.com>2014-05-15 17:00:11 -0700
committerTim Hatch <tim@timhatch.com>2014-05-15 17:00:11 -0700
commit860bff820e92283aaee4bac1e09a7becfc9f61e8 (patch)
tree652c0bbca42a3dcdf5294505adfef2da944a22d7 /pygments/lexers/asm.py
parent9daec978bb255a76890cfa7c977b504a0e4fe4a4 (diff)
parent919938e38d438dbcba6ed64423fd8f7375a0f59e (diff)
downloadpygments-860bff820e92283aaee4bac1e09a7becfc9f61e8.tar.gz
Merged in andyli/pygments-main (pull request #354)
Haxe fixes
Diffstat (limited to 'pygments/lexers/asm.py')
-rw-r--r--pygments/lexers/asm.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pygments/lexers/asm.py b/pygments/lexers/asm.py
index fc361e2f..13649521 100644
--- a/pygments/lexers/asm.py
+++ b/pygments/lexers/asm.py
@@ -318,7 +318,7 @@ class NasmLexer(RegexLexer):
filenames = ['*.asm', '*.ASM']
mimetypes = ['text/x-nasm']
- identifier = r'[a-zA-Z$._?][a-zA-Z0-9$._?#@~]*'
+ identifier = r'[a-zA-Z$._?][\w$.?#@~]*'
hexn = r'(?:0[xX][0-9a-fA-F]+|$0[0-9a-fA-F]*|[0-9]+[0-9a-fA-F]*h)'
octn = r'[0-7]+q'
binn = r'[01]+b'
@@ -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),