github-starred/pygments-xojo
2
0
Fork 0
mirror of https://github.com/declaresub/pygments-xojo.git synced 2026-05-15 06:05:50 -06:00
Code Issues 1 Projects Packages Wiki Activity Actions

Improve consistency of edge case classifications

Browse source
This commit is contained in:
donl 2016-02-13 14:28:40 -07:00
parent d8d929aff6
commit a2e8518f45
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pygments_xojo/lexer.py
View file

@ -55,7 +55,7 @@ class XojoLexer(_LexerOptionsMixin, RegexLexer):
'Lib', 'Loop', 'Module', 'Next', 'New', 'Namespace', 'Optional', 'ParamArray', 'Private',
'Protected', 'Public', 'Return', 'Select', 'Selector', 'Shared', 'Soft', 'Step', 'Structure',
'Sub', 'Then', 'To', 'Try', 'Until', 'Wend', 'While', 'With', 'WithEvents',
'#if', '#else', '#elseif', '#endif', '#pragma', '#tag']
'#if', '#else', '#elseif', '#endif', '#pragma']
OPERATOR_WORDS = ['And', 'Is', 'IsA', 'Mod', 'Not', 'Or', 'Xor', 'AddressOf', 'Array',
'Ctype', 'GetTypeInfo', 'RaiseEvent', 'Redim', 'WeakAddressOf']
TYPES = ['Boolean', 'Byte', 'Color', 'Currency', 'Delegate', 'Double', 'Integer',
@ -73,6 +73,7 @@ class XojoLexer(_LexerOptionsMixin, RegexLexer):
'root': [
include('whitespace'),
(words(['#tag'], suffix=WORD_SUFFIX), Comment.Preproc),
(words(DECLARATIONS, suffix=WORD_SUFFIX), Keyword.Declaration),
(words(CONSTANTS, suffix=WORD_SUFFIX), Keyword.Constant),
(words(PSEUDO_BUILTINS, suffix=WORD_SUFFIX), Name.Builtin.Pseudo),
@ -93,15 +94,18 @@ class XojoLexer(_LexerOptionsMixin, RegexLexer):
(r'([0-9]*\.[0-9]+)([eE][-+]?[0-9]+)?', bygroups(Number.Float, Number.Float)),
(r'[0-9]+', Number.Integer),
(r'(&b[01]+)(\s|_|,|[)])', bygroups(Number.Bin, Text)),
(r'(&b[01]+)(\s+)', bygroups(Number.Bin, Text)),
(r'(&b[01]+)(_|,|[)])', bygroups(Number.Bin, Punctuation)),
(r'(&b[01]+)(\'|//)', bygroups(Number.Bin, Comment),'comment_url'),
(r'(&b[01]+)(<>|<=?|>=?|[-=+*/^\\])', bygroups(Number.Bin, Operator)),
(r'(&o[0-7]+)(\s|_|,|[)])', bygroups(Number.Oct, Text)),
(r'(&o[0-7]+)(\s+)', bygroups(Number.Oct, Text)),
(r'(&o[0-7]+)(_|,|[)])', bygroups(Number.Oct, Punctuation)),
(r'(&o[0-7]+)(\'|//)', bygroups(Number.Oct, Comment),'comment_url'),
(r'(&o[0-7]+)(<>|<=?|>=?|[-=+*/^\\])', bygroups(Number.Oct, Operator)),
(r'(&h[0-9a-fA-F]+)(\s|_|,|[)])', bygroups(Number.Hex, Text)),
(r'(&h[0-9a-fA-F]+)(\s+)', bygroups(Number.Oct, Text)),
(r'(&h[0-9a-fA-F]+)(_|,|[)])', bygroups(Number.Oct, Punctuation)),
(r'(&h[0-9a-fA-F]+)(\'|//)', bygroups(Number.Hex, Comment),'comment_url'),
(r'(&h[0-9a-fA-F]+)(<>|<=?|>=?|[-=+*/^\\])', bygroups(Number.Hex, Operator)),

2
pygments_xojo/styles.py
View file

@ -19,7 +19,7 @@ class XojoStyle(Style):
# Whitespace: "#bbbbbb",
Comment: "#921100",
Comment.URL: "underline #0C33FE",
Comment.Preproc: "#0C33FE",
Keyword: "#0C33FE",
Operator: "#000000",