summaryrefslogtreecommitdiff
path: root/pygments/lexers/compiled.py
diff options
context:
space:
mode:
authorthomasvandoren <thomas.vandoren@gmail.com>2014-09-09 09:16:41 -0700
committerthomasvandoren <thomas.vandoren@gmail.com>2014-09-09 09:16:41 -0700
commit9a44bbccb8edffbf033a2fa9b66bb9cc8b7e4e7c (patch)
tree3927d7156ebfadbbf4f02b923bfc2f4e8993d310 /pygments/lexers/compiled.py
parentfb6c708a8b3706cf97ebfecb9ad46a92bdf16116 (diff)
parenta0f35d17627456cdc8e608cc0dc2fa6a32dec6d0 (diff)
downloadpygments-9a44bbccb8edffbf033a2fa9b66bb9cc8b7e4e7c.tar.gz
Merged birkenfeld/pygments-main into default
Diffstat (limited to 'pygments/lexers/compiled.py')
-rw-r--r--pygments/lexers/compiled.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py
index 38bd901f..53292dfa 100644
--- a/pygments/lexers/compiled.py
+++ b/pygments/lexers/compiled.py
@@ -3920,10 +3920,10 @@ class ChapelLexer(RegexLexer):
(r'(false|nil|true)\b', Keyword.Constant),
(r'(bool|complex|imag|int|opaque|range|real|string|uint)\b',
Keyword.Type),
- (r'(atomic|begin|break|by|cobegin|coforall|continue|iter|'
+ (r'(align|atomic|begin|break|by|cobegin|coforall|continue|'
r'delete|dmapped|do|domain|else|enum|export|extern|for|forall|'
- r'if|index|inline|label|lambda|let|local|new|on|otherwise|'
- r'reduce|return|scan|select|serial|single|sparse|'
+ r'if|index|inline|iter|label|lambda|let|local|new|noinit|on|'
+ r'otherwise|pragma|reduce|return|scan|select|serial|single|sparse|'
r'subdomain|sync|then|use|when|where|while|yield|zip)\b',
Keyword),
(r'(proc)((?:\s|\\\s)+)', bygroups(Keyword, Text), 'procname'),
@@ -3947,14 +3947,14 @@ class ChapelLexer(RegexLexer):
# -- hex
(r'0[xX][0-9a-fA-F]+', Number.Hex),
# -- decimal
- (r'(0|[1-9][0-9]*)', Number.Integer),
+ (r'[0-9]+', Number.Integer),
# strings
(r'["\'](\\\\|\\"|[^"\'])*["\']', String),
# tokens
(r'(=|\+=|-=|\*=|/=|\*\*=|%=|&=|\|=|\^=|&&=|\|\|=|<<=|>>=|'
- r'<=>|\.\.|by|#|\.\.\.|'
+ r'<=>|<~>|\.\.|by|#|\.\.\.|'
r'&&|\|\||!|&|\||\^|~|<<|>>|'
r'==|!=|<=|>=|<|>|'
r'[+\-*/%]|\*\*)', Operator),