Restoring authorship annotation for <[email protected]>. Commit 1 of 2.

1 files changed, 363 insertions, 363 deletions

diff --git a/contrib/python/Pygments/py2/pygments/lexers/asm.py b/contrib/python/Pygments/py2/pygments/lexers/asm.py
index 32ac936127e..386e93f1cbe 100644
--- a/contrib/python/Pygments/py2/pygments/lexers/asm.py
+++ b/contrib/python/Pygments/py2/pygments/lexers/asm.py
@@ -1,206 +1,206 @@
-# -*- coding: utf-8 -*-
-"""
-    pygments.lexers.asm
-    ~~~~~~~~~~~~~~~~~~~
-
-    Lexers for assembly languages.
-
+# -*- coding: utf-8 -*- 
+""" 
+    pygments.lexers.asm 
+    ~~~~~~~~~~~~~~~~~~~ 
+ 
+    Lexers for assembly languages. 
+ 
     :copyright: Copyright 2006-2019 by the Pygments team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-"""
-
-import re
-
+    :license: BSD, see LICENSE for details. 
+""" 
+ 
+import re 
+ 
 from pygments.lexer import RegexLexer, include, bygroups, using, words, \
     DelegatingLexer
-from pygments.lexers.c_cpp import CppLexer, CLexer
-from pygments.lexers.d import DLexer
-from pygments.token import Text, Name, Number, String, Comment, Punctuation, \
-    Other, Keyword, Operator
-
-__all__ = ['GasLexer', 'ObjdumpLexer', 'DObjdumpLexer', 'CppObjdumpLexer',
+from pygments.lexers.c_cpp import CppLexer, CLexer 
+from pygments.lexers.d import DLexer 
+from pygments.token import Text, Name, Number, String, Comment, Punctuation, \ 
+    Other, Keyword, Operator 
+ 
+__all__ = ['GasLexer', 'ObjdumpLexer', 'DObjdumpLexer', 'CppObjdumpLexer', 
            'CObjdumpLexer', 'HsailLexer', 'LlvmLexer', 'NasmLexer',
            'NasmObjdumpLexer', 'TasmLexer', 'Ca65Lexer', 'Dasm16Lexer']
-
-
-class GasLexer(RegexLexer):
-    """
-    For Gas (AT&T) assembly code.
-    """
-    name = 'GAS'
-    aliases = ['gas', 'asm']
-    filenames = ['*.s', '*.S']
-    mimetypes = ['text/x-gas']
-
-    #: optional Comment or Whitespace
-    string = r'"(\\"|[^"])*"'
-    char = r'[\w$.@-]'
+ 
+ 
+class GasLexer(RegexLexer): 
+    """ 
+    For Gas (AT&T) assembly code. 
+    """ 
+    name = 'GAS' 
+    aliases = ['gas', 'asm'] 
+    filenames = ['*.s', '*.S'] 
+    mimetypes = ['text/x-gas'] 
+ 
+    #: optional Comment or Whitespace 
+    string = r'"(\\"|[^"])*"' 
+    char = r'[\w$.@-]' 
     identifier = r'(?:[a-zA-Z$_]' + char + r'*|\.' + char + '+)'
-    number = r'(?:0[xX][a-zA-Z0-9]+|\d+)'
+    number = r'(?:0[xX][a-zA-Z0-9]+|\d+)' 
     register = '%' + identifier
-
-    tokens = {
-        'root': [
-            include('whitespace'),
-            (identifier + ':', Name.Label),
-            (r'\.' + identifier, Name.Attribute, 'directive-args'),
-            (r'lock|rep(n?z)?|data\d+', Name.Attribute),
-            (identifier, Name.Function, 'instruction-args'),
-            (r'[\r\n]+', Text)
-        ],
-        'directive-args': [
-            (identifier, Name.Constant),
-            (string, String),
-            ('@' + identifier, Name.Attribute),
-            (number, Number.Integer),
+ 
+    tokens = { 
+        'root': [ 
+            include('whitespace'), 
+            (identifier + ':', Name.Label), 
+            (r'\.' + identifier, Name.Attribute, 'directive-args'), 
+            (r'lock|rep(n?z)?|data\d+', Name.Attribute), 
+            (identifier, Name.Function, 'instruction-args'), 
+            (r'[\r\n]+', Text) 
+        ], 
+        'directive-args': [ 
+            (identifier, Name.Constant), 
+            (string, String), 
+            ('@' + identifier, Name.Attribute), 
+            (number, Number.Integer), 
             (register, Name.Variable),
-            (r'[\r\n]+', Text, '#pop'),
+            (r'[\r\n]+', Text, '#pop'), 
             (r'[;#].*?\n', Comment, '#pop'),
-
-            include('punctuation'),
-            include('whitespace')
-        ],
-        'instruction-args': [
-            # For objdump-disassembled code, shouldn't occur in
-            # actual assembler input
-            ('([a-z0-9]+)( )(<)('+identifier+')(>)',
-                bygroups(Number.Hex, Text, Punctuation, Name.Constant,
-                         Punctuation)),
-            ('([a-z0-9]+)( )(<)('+identifier+')([-+])('+number+')(>)',
-                bygroups(Number.Hex, Text, Punctuation, Name.Constant,
-                         Punctuation, Number.Integer, Punctuation)),
-
-            # Address constants
-            (identifier, Name.Constant),
-            (number, Number.Integer),
-            # Registers
+ 
+            include('punctuation'), 
+            include('whitespace') 
+        ], 
+        'instruction-args': [ 
+            # For objdump-disassembled code, shouldn't occur in 
+            # actual assembler input 
+            ('([a-z0-9]+)( )(<)('+identifier+')(>)', 
+                bygroups(Number.Hex, Text, Punctuation, Name.Constant, 
+                         Punctuation)), 
+            ('([a-z0-9]+)( )(<)('+identifier+')([-+])('+number+')(>)', 
+                bygroups(Number.Hex, Text, Punctuation, Name.Constant, 
+                         Punctuation, Number.Integer, Punctuation)), 
+ 
+            # Address constants 
+            (identifier, Name.Constant), 
+            (number, Number.Integer), 
+            # Registers 
             (register, Name.Variable),
-            # Numeric constants
-            ('$'+number, Number.Integer),
-            (r"$'(.|\\')'", String.Char),
-            (r'[\r\n]+', Text, '#pop'),
+            # Numeric constants 
+            ('$'+number, Number.Integer), 
+            (r"$'(.|\\')'", String.Char), 
+            (r'[\r\n]+', Text, '#pop'), 
             (r'[;#].*?\n', Comment, '#pop'),
 
-            include('punctuation'),
-            include('whitespace')
-        ],
-        'whitespace': [
-            (r'\n', Text),
-            (r'\s+', Text),
+            include('punctuation'), 
+            include('whitespace') 
+        ], 
+        'whitespace': [ 
+            (r'\n', Text), 
+            (r'\s+', Text), 
             (r'[;#].*?\n', Comment)
-        ],
-        'punctuation': [
-            (r'[-*,.()\[\]!:]+', Punctuation)
-        ]
-    }
-
-    def analyse_text(text):
-        if re.match(r'^\.(text|data|section)', text, re.M):
-            return True
-        elif re.match(r'^\.\w+', text, re.M):
-            return 0.1
-
-
-def _objdump_lexer_tokens(asm_lexer):
-    """
-    Common objdump lexer tokens to wrap an ASM lexer.
-    """
-    hex_re = r'[0-9A-Za-z]'
-    return {
-        'root': [
-            # File name & format:
-            ('(.*?)(:)( +file format )(.*?)$',
-                bygroups(Name.Label, Punctuation, Text, String)),
-            # Section header
-            ('(Disassembly of section )(.*?)(:)$',
-                bygroups(Text, Name.Label, Punctuation)),
-            # Function labels
-            # (With offset)
-            ('('+hex_re+'+)( )(<)(.*?)([-+])(0[xX][A-Za-z0-9]+)(>:)$',
-                bygroups(Number.Hex, Text, Punctuation, Name.Function,
-                         Punctuation, Number.Hex, Punctuation)),
-            # (Without offset)
-            ('('+hex_re+'+)( )(<)(.*?)(>:)$',
-                bygroups(Number.Hex, Text, Punctuation, Name.Function,
-                         Punctuation)),
-            # Code line with disassembled instructions
-            ('( *)('+hex_re+r'+:)(\t)((?:'+hex_re+hex_re+' )+)( *\t)([a-zA-Z].*?)$',
-                bygroups(Text, Name.Label, Text, Number.Hex, Text,
-                         using(asm_lexer))),
-            # Code line with ascii
-            ('( *)('+hex_re+r'+:)(\t)((?:'+hex_re+hex_re+' )+)( *)(.*?)$',
-                bygroups(Text, Name.Label, Text, Number.Hex, Text, String)),
-            # Continued code line, only raw opcodes without disassembled
-            # instruction
-            ('( *)('+hex_re+r'+:)(\t)((?:'+hex_re+hex_re+' )+)$',
-                bygroups(Text, Name.Label, Text, Number.Hex)),
-            # Skipped a few bytes
-            (r'\t\.\.\.$', Text),
-            # Relocation line
-            # (With offset)
-            (r'(\t\t\t)('+hex_re+r'+:)( )([^\t]+)(\t)(.*?)([-+])(0x'+hex_re+'+)$',
-                bygroups(Text, Name.Label, Text, Name.Property, Text,
-                         Name.Constant, Punctuation, Number.Hex)),
-            # (Without offset)
-            (r'(\t\t\t)('+hex_re+r'+:)( )([^\t]+)(\t)(.*?)$',
-                bygroups(Text, Name.Label, Text, Name.Property, Text,
-                         Name.Constant)),
-            (r'[^\n]+\n', Other)
-        ]
-    }
-
-
-class ObjdumpLexer(RegexLexer):
-    """
-    For the output of 'objdump -dr'
-    """
-    name = 'objdump'
-    aliases = ['objdump']
-    filenames = ['*.objdump']
-    mimetypes = ['text/x-objdump']
-
-    tokens = _objdump_lexer_tokens(GasLexer)
-
-
-class DObjdumpLexer(DelegatingLexer):
-    """
-    For the output of 'objdump -Sr on compiled D files'
-    """
-    name = 'd-objdump'
-    aliases = ['d-objdump']
-    filenames = ['*.d-objdump']
-    mimetypes = ['text/x-d-objdump']
-
-    def __init__(self, **options):
-        super(DObjdumpLexer, self).__init__(DLexer, ObjdumpLexer, **options)
-
-
-class CppObjdumpLexer(DelegatingLexer):
-    """
-    For the output of 'objdump -Sr on compiled C++ files'
-    """
-    name = 'cpp-objdump'
-    aliases = ['cpp-objdump', 'c++-objdumb', 'cxx-objdump']
-    filenames = ['*.cpp-objdump', '*.c++-objdump', '*.cxx-objdump']
-    mimetypes = ['text/x-cpp-objdump']
-
-    def __init__(self, **options):
-        super(CppObjdumpLexer, self).__init__(CppLexer, ObjdumpLexer, **options)
-
-
-class CObjdumpLexer(DelegatingLexer):
-    """
-    For the output of 'objdump -Sr on compiled C files'
-    """
-    name = 'c-objdump'
-    aliases = ['c-objdump']
-    filenames = ['*.c-objdump']
-    mimetypes = ['text/x-c-objdump']
-
-    def __init__(self, **options):
-        super(CObjdumpLexer, self).__init__(CLexer, ObjdumpLexer, **options)
-
-
+        ], 
+        'punctuation': [ 
+            (r'[-*,.()\[\]!:]+', Punctuation) 
+        ] 
+    } 
+ 
+    def analyse_text(text): 
+        if re.match(r'^\.(text|data|section)', text, re.M): 
+            return True 
+        elif re.match(r'^\.\w+', text, re.M): 
+            return 0.1 
+ 
+ 
+def _objdump_lexer_tokens(asm_lexer): 
+    """ 
+    Common objdump lexer tokens to wrap an ASM lexer. 
+    """ 
+    hex_re = r'[0-9A-Za-z]' 
+    return { 
+        'root': [ 
+            # File name & format: 
+            ('(.*?)(:)( +file format )(.*?)$', 
+                bygroups(Name.Label, Punctuation, Text, String)), 
+            # Section header 
+            ('(Disassembly of section )(.*?)(:)$', 
+                bygroups(Text, Name.Label, Punctuation)), 
+            # Function labels 
+            # (With offset) 
+            ('('+hex_re+'+)( )(<)(.*?)([-+])(0[xX][A-Za-z0-9]+)(>:)$', 
+                bygroups(Number.Hex, Text, Punctuation, Name.Function, 
+                         Punctuation, Number.Hex, Punctuation)), 
+            # (Without offset) 
+            ('('+hex_re+'+)( )(<)(.*?)(>:)$', 
+                bygroups(Number.Hex, Text, Punctuation, Name.Function, 
+                         Punctuation)), 
+            # Code line with disassembled instructions 
+            ('( *)('+hex_re+r'+:)(\t)((?:'+hex_re+hex_re+' )+)( *\t)([a-zA-Z].*?)$', 
+                bygroups(Text, Name.Label, Text, Number.Hex, Text, 
+                         using(asm_lexer))), 
+            # Code line with ascii 
+            ('( *)('+hex_re+r'+:)(\t)((?:'+hex_re+hex_re+' )+)( *)(.*?)$', 
+                bygroups(Text, Name.Label, Text, Number.Hex, Text, String)), 
+            # Continued code line, only raw opcodes without disassembled 
+            # instruction 
+            ('( *)('+hex_re+r'+:)(\t)((?:'+hex_re+hex_re+' )+)$', 
+                bygroups(Text, Name.Label, Text, Number.Hex)), 
+            # Skipped a few bytes 
+            (r'\t\.\.\.$', Text), 
+            # Relocation line 
+            # (With offset) 
+            (r'(\t\t\t)('+hex_re+r'+:)( )([^\t]+)(\t)(.*?)([-+])(0x'+hex_re+'+)$', 
+                bygroups(Text, Name.Label, Text, Name.Property, Text, 
+                         Name.Constant, Punctuation, Number.Hex)), 
+            # (Without offset) 
+            (r'(\t\t\t)('+hex_re+r'+:)( )([^\t]+)(\t)(.*?)$', 
+                bygroups(Text, Name.Label, Text, Name.Property, Text, 
+                         Name.Constant)), 
+            (r'[^\n]+\n', Other) 
+        ] 
+    } 
+ 
+ 
+class ObjdumpLexer(RegexLexer): 
+    """ 
+    For the output of 'objdump -dr' 
+    """ 
+    name = 'objdump' 
+    aliases = ['objdump'] 
+    filenames = ['*.objdump'] 
+    mimetypes = ['text/x-objdump'] 
+ 
+    tokens = _objdump_lexer_tokens(GasLexer) 
+ 
+ 
+class DObjdumpLexer(DelegatingLexer): 
+    """ 
+    For the output of 'objdump -Sr on compiled D files' 
+    """ 
+    name = 'd-objdump' 
+    aliases = ['d-objdump'] 
+    filenames = ['*.d-objdump'] 
+    mimetypes = ['text/x-d-objdump'] 
+ 
+    def __init__(self, **options): 
+        super(DObjdumpLexer, self).__init__(DLexer, ObjdumpLexer, **options) 
+ 
+ 
+class CppObjdumpLexer(DelegatingLexer): 
+    """ 
+    For the output of 'objdump -Sr on compiled C++ files' 
+    """ 
+    name = 'cpp-objdump' 
+    aliases = ['cpp-objdump', 'c++-objdumb', 'cxx-objdump'] 
+    filenames = ['*.cpp-objdump', '*.c++-objdump', '*.cxx-objdump'] 
+    mimetypes = ['text/x-cpp-objdump'] 
+ 
+    def __init__(self, **options): 
+        super(CppObjdumpLexer, self).__init__(CppLexer, ObjdumpLexer, **options) 
+ 
+ 
+class CObjdumpLexer(DelegatingLexer): 
+    """ 
+    For the output of 'objdump -Sr on compiled C files' 
+    """ 
+    name = 'c-objdump' 
+    aliases = ['c-objdump'] 
+    filenames = ['*.c-objdump'] 
+    mimetypes = ['text/x-c-objdump'] 
+ 
+    def __init__(self, **options): 
+        super(CObjdumpLexer, self).__init__(CLexer, ObjdumpLexer, **options) 
+ 
+ 
 class HsailLexer(RegexLexer):
     """
     For HSAIL assembly code.
@@ -336,48 +336,48 @@ class HsailLexer(RegexLexer):
     }
 
 
-class LlvmLexer(RegexLexer):
-    """
-    For LLVM assembly code.
-    """
-    name = 'LLVM'
-    aliases = ['llvm']
-    filenames = ['*.ll']
-    mimetypes = ['text/x-llvm']
-
-    #: optional Comment or Whitespace
-    string = r'"[^"]*?"'
-    identifier = r'([-a-zA-Z$._][\w\-$.]*|' + string + ')'
-
-    tokens = {
-        'root': [
-            include('whitespace'),
-
-            # Before keywords, because keywords are valid label names :(...
+class LlvmLexer(RegexLexer): 
+    """ 
+    For LLVM assembly code. 
+    """ 
+    name = 'LLVM' 
+    aliases = ['llvm'] 
+    filenames = ['*.ll'] 
+    mimetypes = ['text/x-llvm'] 
+ 
+    #: optional Comment or Whitespace 
+    string = r'"[^"]*?"' 
+    identifier = r'([-a-zA-Z$._][\w\-$.]*|' + string + ')' 
+ 
+    tokens = { 
+        'root': [ 
+            include('whitespace'), 
+ 
+            # Before keywords, because keywords are valid label names :(... 
             (identifier + r'\s*:', Name.Label),
-
-            include('keyword'),
-
-            (r'%' + identifier, Name.Variable),
-            (r'@' + identifier, Name.Variable.Global),
-            (r'%\d+', Name.Variable.Anonymous),
-            (r'@\d+', Name.Variable.Global),
-            (r'#\d+', Name.Variable.Global),
-            (r'!' + identifier, Name.Variable),
-            (r'!\d+', Name.Variable.Anonymous),
-            (r'c?' + string, String),
-
-            (r'0[xX][a-fA-F0-9]+', Number),
-            (r'-?\d+(?:[.]\d+)?(?:[eE][-+]?\d+(?:[.]\d+)?)?', Number),
-
-            (r'[=<>{}\[\]()*.,!]|x\b', Punctuation)
-        ],
-        'whitespace': [
-            (r'(\n|\s)+', Text),
-            (r';.*?\n', Comment)
-        ],
-        'keyword': [
-            # Regular keywords
+ 
+            include('keyword'), 
+ 
+            (r'%' + identifier, Name.Variable), 
+            (r'@' + identifier, Name.Variable.Global), 
+            (r'%\d+', Name.Variable.Anonymous), 
+            (r'@\d+', Name.Variable.Global), 
+            (r'#\d+', Name.Variable.Global), 
+            (r'!' + identifier, Name.Variable), 
+            (r'!\d+', Name.Variable.Anonymous), 
+            (r'c?' + string, String), 
+ 
+            (r'0[xX][a-fA-F0-9]+', Number), 
+            (r'-?\d+(?:[.]\d+)?(?:[eE][-+]?\d+(?:[.]\d+)?)?', Number), 
+ 
+            (r'[=<>{}\[\]()*.,!]|x\b', Punctuation) 
+        ], 
+        'whitespace': [ 
+            (r'(\n|\s)+', Text), 
+            (r';.*?\n', Comment) 
+        ], 
+        'keyword': [ 
+            # Regular keywords 
             (words((
                 'acq_rel', 'acquire', 'add', 'addrspace', 'addrspacecast', 'afn', 'alias',
                 'aliasee', 'align', 'alignLog2', 'alignstack', 'alloca', 'allocsize', 'allOnes',
@@ -437,115 +437,115 @@ class LlvmLexer(RegexLexer):
                 'x86_regcallcc', 'x86_stdcallcc', 'x86_thiscallcc', 'x86_vectorcallcc', 'xchg',
                 'xor', 'zeroext', 'zeroinitializer', 'zext'),
                 suffix=r'\b'), Keyword),
-
-            # Types
+ 
+            # Types 
             (words(('void', 'half', 'float', 'double', 'x86_fp80', 'fp128',
                     'ppc_fp128', 'label', 'metadata', 'token')), Keyword.Type),
-
-            # Integer types
-            (r'i[1-9]\d*', Keyword)
-        ]
-    }
-
-
-class NasmLexer(RegexLexer):
-    """
-    For Nasm (Intel) assembly code.
-    """
-    name = 'NASM'
-    aliases = ['nasm']
-    filenames = ['*.asm', '*.ASM']
-    mimetypes = ['text/x-nasm']
-
+ 
+            # Integer types 
+            (r'i[1-9]\d*', Keyword) 
+        ] 
+    } 
+ 
+ 
+class NasmLexer(RegexLexer): 
+    """ 
+    For Nasm (Intel) assembly code. 
+    """ 
+    name = 'NASM' 
+    aliases = ['nasm'] 
+    filenames = ['*.asm', '*.ASM'] 
+    mimetypes = ['text/x-nasm'] 
+ 
     # Tasm uses the same file endings, but TASM is not as common as NASM, so
     # we prioritize NASM higher by default
     priority = 1.0
 
-    identifier = r'[a-z$._?][\w$.?#@~]*'
-    hexn = r'(?:0x[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]+'
-    floatn = decn + r'\.e?' + decn
-    string = r'"(\\"|[^"\n])*"|' + r"'(\\'|[^'\n])*'|" + r"`(\\`|[^`\n])*`"
-    declkw = r'(?:res|d)[bwdqt]|times'
-    register = (r'r[0-9][0-5]?[bwd]|'
-                r'[a-d][lh]|[er]?[a-d]x|[er]?[sb]p|[er]?[sd]i|[c-gs]s|st[0-7]|'
-                r'mm[0-7]|cr[0-4]|dr[0-367]|tr[3-7]')
-    wordop = r'seg|wrt|strict'
-    type = r'byte|[dq]?word'
+    identifier = r'[a-z$._?][\w$.?#@~]*' 
+    hexn = r'(?:0x[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]+' 
+    floatn = decn + r'\.e?' + decn 
+    string = r'"(\\"|[^"\n])*"|' + r"'(\\'|[^'\n])*'|" + r"`(\\`|[^`\n])*`" 
+    declkw = r'(?:res|d)[bwdqt]|times' 
+    register = (r'r[0-9][0-5]?[bwd]|' 
+                r'[a-d][lh]|[er]?[a-d]x|[er]?[sb]p|[er]?[sd]i|[c-gs]s|st[0-7]|' 
+                r'mm[0-7]|cr[0-4]|dr[0-367]|tr[3-7]') 
+    wordop = r'seg|wrt|strict' 
+    type = r'byte|[dq]?word' 
     # Directives must be followed by whitespace, otherwise CPU will match
     # cpuid for instance.
     directives = (r'(?:BITS|USE16|USE32|SECTION|SEGMENT|ABSOLUTE|EXTERN|GLOBAL|'
-                  r'ORG|ALIGN|STRUC|ENDSTRUC|COMMON|CPU|GROUP|UPPERCASE|IMPORT|'
+                  r'ORG|ALIGN|STRUC|ENDSTRUC|COMMON|CPU|GROUP|UPPERCASE|IMPORT|' 
                   r'EXPORT|LIBRARY|MODULE)\s+')
-
-    flags = re.IGNORECASE | re.MULTILINE
-    tokens = {
-        'root': [
-            (r'^\s*%', Comment.Preproc, 'preproc'),
-            include('whitespace'),
-            (identifier + ':', Name.Label),
-            (r'(%s)(\s+)(equ)' % identifier,
-                bygroups(Name.Constant, Keyword.Declaration, Keyword.Declaration),
-                'instruction-args'),
-            (directives, Keyword, 'instruction-args'),
-            (declkw, Keyword.Declaration, 'instruction-args'),
-            (identifier, Name.Function, 'instruction-args'),
-            (r'[\r\n]+', Text)
-        ],
-        'instruction-args': [
-            (string, String),
-            (hexn, Number.Hex),
-            (octn, Number.Oct),
-            (binn, Number.Bin),
-            (floatn, Number.Float),
-            (decn, Number.Integer),
-            include('punctuation'),
-            (register, Name.Builtin),
-            (identifier, Name.Variable),
-            (r'[\r\n]+', Text, '#pop'),
-            include('whitespace')
-        ],
-        'preproc': [
-            (r'[^;\n]+', Comment.Preproc),
-            (r';.*?\n', Comment.Single, '#pop'),
-            (r'\n', Comment.Preproc, '#pop'),
-        ],
-        'whitespace': [
-            (r'\n', Text),
-            (r'[ \t]+', Text),
-            (r';.*', Comment.Single)
-        ],
-        'punctuation': [
-            (r'[,():\[\]]+', Punctuation),
-            (r'[&|^<>+*/%~-]+', Operator),
-            (r'[$]+', Keyword.Constant),
-            (wordop, Operator.Word),
-            (type, Keyword.Type)
-        ],
-    }
-
+ 
+    flags = re.IGNORECASE | re.MULTILINE 
+    tokens = { 
+        'root': [ 
+            (r'^\s*%', Comment.Preproc, 'preproc'), 
+            include('whitespace'), 
+            (identifier + ':', Name.Label), 
+            (r'(%s)(\s+)(equ)' % identifier, 
+                bygroups(Name.Constant, Keyword.Declaration, Keyword.Declaration), 
+                'instruction-args'), 
+            (directives, Keyword, 'instruction-args'), 
+            (declkw, Keyword.Declaration, 'instruction-args'), 
+            (identifier, Name.Function, 'instruction-args'), 
+            (r'[\r\n]+', Text) 
+        ], 
+        'instruction-args': [ 
+            (string, String), 
+            (hexn, Number.Hex), 
+            (octn, Number.Oct), 
+            (binn, Number.Bin), 
+            (floatn, Number.Float), 
+            (decn, Number.Integer), 
+            include('punctuation'), 
+            (register, Name.Builtin), 
+            (identifier, Name.Variable), 
+            (r'[\r\n]+', Text, '#pop'), 
+            include('whitespace') 
+        ], 
+        'preproc': [ 
+            (r'[^;\n]+', Comment.Preproc), 
+            (r';.*?\n', Comment.Single, '#pop'), 
+            (r'\n', Comment.Preproc, '#pop'), 
+        ], 
+        'whitespace': [ 
+            (r'\n', Text), 
+            (r'[ \t]+', Text), 
+            (r';.*', Comment.Single) 
+        ], 
+        'punctuation': [ 
+            (r'[,():\[\]]+', Punctuation), 
+            (r'[&|^<>+*/%~-]+', Operator), 
+            (r'[$]+', Keyword.Constant), 
+            (wordop, Operator.Word), 
+            (type, Keyword.Type) 
+        ], 
+    } 
+ 
     def analyse_text(text):
         # Probably TASM
         if re.match(r'PROC', text, re.IGNORECASE):
             return False
-
-
-class NasmObjdumpLexer(ObjdumpLexer):
-    """
-    For the output of 'objdump -d -M intel'.
-
-    .. versionadded:: 2.0
-    """
-    name = 'objdump-nasm'
-    aliases = ['objdump-nasm']
-    filenames = ['*.objdump-intel']
-    mimetypes = ['text/x-nasm-objdump']
-
-    tokens = _objdump_lexer_tokens(NasmLexer)
-
-
+ 
+
+class NasmObjdumpLexer(ObjdumpLexer): 
+    """ 
+    For the output of 'objdump -d -M intel'. 
+ 
+    .. versionadded:: 2.0 
+    """ 
+    name = 'objdump-nasm' 
+    aliases = ['objdump-nasm'] 
+    filenames = ['*.objdump-intel'] 
+    mimetypes = ['text/x-nasm-objdump'] 
+ 
+    tokens = _objdump_lexer_tokens(NasmLexer) 
+ 
+ 
 class TasmLexer(RegexLexer):
     """
     For Tasm (Turbo Assembler) assembly code.
@@ -631,43 +631,43 @@ class TasmLexer(RegexLexer):
             return True
 
 
-class Ca65Lexer(RegexLexer):
-    """
-    For ca65 assembler sources.
-
-    .. versionadded:: 1.6
-    """
-    name = 'ca65 assembler'
-    aliases = ['ca65']
-    filenames = ['*.s']
-
-    flags = re.IGNORECASE
-
-    tokens = {
-        'root': [
-            (r';.*', Comment.Single),
-            (r'\s+', Text),
-            (r'[a-z_.@$][\w.@$]*:', Name.Label),
-            (r'((ld|st)[axy]|(in|de)[cxy]|asl|lsr|ro[lr]|adc|sbc|cmp|cp[xy]'
-             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'\.\w+', Keyword.Pseudo),
-            (r'[-+~*/^&|!<>=]', Operator),
-            (r'"[^"\n]*.', String),
-            (r"'[^'\n]*.", String.Char),
-            (r'\$[0-9a-f]+|[0-9a-f]+h\b', Number.Hex),
-            (r'\d+', Number.Integer),
-            (r'%[01]+', Number.Bin),
-            (r'[#,.:()=\[\]]', Punctuation),
-            (r'[a-z_.@$][\w.@$]*', Name),
-        ]
-    }
-
-    def analyse_text(self, text):
-        # comments in GAS start with "#"
-        if re.match(r'^\s*;', text, re.MULTILINE):
-            return 0.9
+class Ca65Lexer(RegexLexer): 
+    """ 
+    For ca65 assembler sources. 
+ 
+    .. versionadded:: 1.6 
+    """ 
+    name = 'ca65 assembler' 
+    aliases = ['ca65'] 
+    filenames = ['*.s'] 
+ 
+    flags = re.IGNORECASE 
+ 
+    tokens = { 
+        'root': [ 
+            (r';.*', Comment.Single), 
+            (r'\s+', Text), 
+            (r'[a-z_.@$][\w.@$]*:', Name.Label), 
+            (r'((ld|st)[axy]|(in|de)[cxy]|asl|lsr|ro[lr]|adc|sbc|cmp|cp[xy]' 
+             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'\.\w+', Keyword.Pseudo), 
+            (r'[-+~*/^&|!<>=]', Operator), 
+            (r'"[^"\n]*.', String), 
+            (r"'[^'\n]*.", String.Char), 
+            (r'\$[0-9a-f]+|[0-9a-f]+h\b', Number.Hex), 
+            (r'\d+', Number.Integer), 
+            (r'%[01]+', Number.Bin), 
+            (r'[#,.:()=\[\]]', Punctuation), 
+            (r'[a-z_.@$][\w.@$]*', Name), 
+        ] 
+    } 
+ 
+    def analyse_text(self, text): 
+        # comments in GAS start with "#" 
+        if re.match(r'^\s*;', text, re.MULTILINE): 
+            return 0.9 
 
 
 class Dasm16Lexer(RegexLexer):