eric: comparison ThirdParty/Pygments/pygments/lexers/asm.py

-:91114a975eda
+:2f29a0b6e1c7
 pygments.lexers.asm
 ~~~~~~~~~~~~~~~~~~~
 Lexers for assembly languages.
-:copyright: Copyright 2006-2009 by the Pygments team, see AUTHORS.
+:copyright: Copyright 2006-2010 by the Pygments team, see AUTHORS.
 :license: BSD, see LICENSE for details.
 """
 import re
-try:
-set
-except NameError:
-from sets import Set as set
 from pygments.lexer import RegexLexer, include, bygroups, using, DelegatingLexer
 from pygments.lexers.compiled import DLexer, CppLexer, CLexer
 from pygments.token import *
 filenames = ['*.ll']
 mimetypes = ['text/x-llvm']
 #: optional Comment or Whitespace
 string = r'"[^"]*?"'
-identifier = r'([a-zA-Z$._][a-zA-Z$._0-9]*|' + string + ')'
+identifier = r'([-a-zA-Z$._][-a-zA-Z$._0-9]*|' + string + ')'
 tokens = {
 'root': [
 include('whitespace'),
 (r'^\s*' + identifier + '\s*:', Name.Label),
 include('keyword'),
 (r'%' + identifier, Name.Variable),#Name.Identifier.Local),
-(r'@' + identifier, Name.Constant),#Name.Identifier.Global),
+(r'@' + identifier, Name.Variable.Global),#Name.Identifier.Global),
 (r'%\d+', Name.Variable.Anonymous),#Name.Identifier.Anonymous),
+(r'@\d+', Name.Variable.Global),#Name.Identifier.Anonymous),
+(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)
+(r'[=<>{}\[\]()*.,!]|x\b', Punctuation)
 ],
 'whitespace': [
 (r'(\n|\s)+', Text),
 (r';.*?\n', Comment)
 ],
 'keyword': [
 # Regular keywords
-(r'(void|label|float|double|opaque'
+(r'(begin|end'
-r'|to'
+r'|true|false'
-r'|alias|type'
+r'|declare|define'
-r'|zeroext|signext|inreg|sret|noalias|noreturn|nounwind|nest'
+r'|global|constant'
-r'|module|asm|target|datalayout|triple'
-r'|true|false|null|zeroinitializer|undef'
+r'|private|linker_private|internal|available_externally|linkonce'
-r'|global|internal|external|linkonce|weak|appending|extern_weak'
+r'|linkonce_odr|weak|weak_odr|appending|dllimport|dllexport'
-r'|dllimport|dllexport'
+r'|common|default|hidden|protected|extern_weak|external'
-r'|ccc|fastcc|coldcc|cc|tail'
+r'|thread_local|zeroinitializer|undef|null|to|tail|target|triple'
-r'|default|hidden|protected'
+r'|deplibs|datalayout|volatile|nuw|nsw|exact|inbounds|align'
-r'|thread_local|constant|align|section'
+r'|addrspace|section|alias|module|asm|sideeffect|gc|dbg'
-r'|define|declare'
+r'|ccc|fastcc|coldcc|x86_stdcallcc|x86_fastcallcc|arm_apcscc'
-# Statements & expressions
+r'|arm_aapcscc|arm_aapcs_vfpcc'
-r'|trunc|zext|sext|fptrunc|fpext|fptoui|fptosi|uitofp|sitofp'
-r'|ptrtoint|inttoptr|bitcast|getelementptr|select|icmp|fcmp'
+r'|cc|c'
-r'|extractelement|insertelement|shufflevector'
-r'|sideeffect|volatile'
+r'|signext|zeroext|inreg|sret|nounwind|noreturn|noalias|nocapture'
-r'|ret|br|switch|invoke|unwind|unreachable'
+r'|byval|nest|readnone|readonly'
-r'|add|sub|mul|udiv|sdiv|fdiv|urem|srem|frem'
-r'|shl|lshr|ashr|and|or|xor'
+r'|inlinehint|noinline|alwaysinline|optsize|ssp|sspreq|noredzone'
-r'|malloc|free|alloca|load|store'
+r'|noimplicitfloat|naked'
-r'|phi|call|va_arg|va_list'
+r'|type|opaque'
-# Comparison condition codes for icmp
-r'|eq|ne|ugt|uge|ult|ule|sgt|sge|slt|sle'
+r'|eq|ne|slt|sgt|sle'
-# Ditto for fcmp: (minus keywords mentioned in other contexts)
+r'|sge|ult|ugt|ule|uge'
-r'|oeq|ogt|oge|olt|ole|one|ord|ueq|ugt|uge|une|uno'
+r'|oeq|one|olt|ogt|ole'
+r'|oge|ord|uno|ueq|une'
+r'|x'
+# instructions
+r'|add|fadd|sub|fsub|mul|fmul|udiv|sdiv|fdiv|urem|srem|frem|shl'
+r'|lshr|ashr|and|or|xor|icmp|fcmp'
+r'|phi|call|trunc|zext|sext|fptrunc|fpext|uitofp|sitofp|fptoui'
+r'fptosi|inttoptr|ptrtoint|bitcast|select|va_arg|ret|br|switch'
+r'|invoke|unwind|unreachable'
+r'|malloc|alloca|free|load|store|getelementptr'
+r'|extractelement|insertelement|shufflevector|getresult'
+r'|extractvalue|insertvalue'
 r')\b', Keyword),
+# Types
+(r'void|float|double|x86_fp80|fp128|ppc_fp128|label|metadata',
+Keyword.Type),
 # Integer types
 (r'i[1-9]\d*', Keyword)
 ]
 }
 aliases = ['nasm']
 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-9a-fA-F]+h)'
+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'
 decn = r'[0-9]+'
 floatn = decn + r'\.e?' + decn
 string = r'"(\\"|[^"])*"|' + r"'(\\'|[^'])*'"
 register = (r'[a-d][lh]|e?[a-d]x|e?[sb]p|e?[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 = (r'BITS|USE16|USE32|SECTION|SEGMENT|ABSOLUTE|EXTERN|GLOBAL|'
-r'COMMON|CPU|GROUP|UPPERCASE|IMPORT|EXPORT|LIBRARY|MODULE')
+r'ORG|ALIGN|STRUC|ENDSTRUC|COMMON|CPU|GROUP|UPPERCASE|IMPORT|'
+r'EXPORT|LIBRARY|MODULE')
 flags = re.IGNORECASE | re.MULTILINE
 tokens = {
 'root': [
 include('whitespace'),
 (r'^\s*%', Comment.Preproc, 'preproc'),
 (identifier + ':', Name.Label),
+(r'(%s)(\s+)(equ)' % identifier,
+bygroups(Name.Constant, Keyword.Declaration, Keyword.Declaration),
+'instruction-args'),
 (directives, Keyword, 'instruction-args'),
-(r'(%s)\s+(equ)' % identifier,
-bygroups(Name.Constant, Keyword.Declaration),
-'instruction-args'),
 (declkw, Keyword.Declaration, 'instruction-args'),
 (identifier, Name.Function, 'instruction-args'),
 (r'[\r\n]+', Text)
 ],
 'instruction-args': [

Mercurial Repositories > eric / file comparison

comparison: ThirdParty/Pygments/pygments/lexers/asm.py

ThirdParty/Pygments/pygments/lexers/asm.py