summaryrefslogtreecommitdiff
path: root/pygments/lexers/pypylog.py
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2011-06-08 16:36:26 +0200
committerArmin Ronacher <armin.ronacher@active-4.com>2011-06-08 16:36:26 +0200
commit93e9db288dd12c783716f624c5592754ad8ee377 (patch)
treedc4987fccb8fb8fcdbd728bad9efec3f23113408 /pygments/lexers/pypylog.py
parent50868eb41f75a263f885927f86d2b4622e40a789 (diff)
downloadpygments-93e9db288dd12c783716f624c5592754ad8ee377.tar.gz
More improvements for the PyPy lexer.
Diffstat (limited to 'pygments/lexers/pypylog.py')
-rw-r--r--pygments/lexers/pypylog.py12
1 files changed, 7 insertions, 5 deletions
diff --git a/pygments/lexers/pypylog.py b/pygments/lexers/pypylog.py
index 8f362c77..365cf2e5 100644
--- a/pygments/lexers/pypylog.py
+++ b/pygments/lexers/pypylog.py
@@ -29,7 +29,7 @@ class PyPyLogLexer(RegexLexer):
(r"[ifp]\d+", Name),
(r"ptr\d+", Name),
- (r"(\()([\w_]+)(\))", bygroups(Punctuation, Name.Builtin, Punctuation)),
+ (r"(\()([\w_]+(:\.[\w_]+)?)(\))", bygroups(Punctuation, Name.Builtin, Punctuation)),
(r"[\[\]=,()]", Punctuation),
(r"(\d+\.\d+|inf|-inf)", Number.Float),
(r"-?\d+", Number.Integer),
@@ -37,19 +37,21 @@ class PyPyLogLexer(RegexLexer):
(r"(None|descr|ConstClass|ConstPtr)", Name),
(r"<.*?>", Name.Builtin),
(r"(debug_merge_point|jump|finish)", Name.Class),
- (r"(int_add_ovf|int_add|int_sub_ovf|int_sub|int_mul_ovf|int_mul|int_or|"
- r"int_eq|int_ne|int_ge|int_gt|int_lt|int_is_zero|int_is_true|"
+ (r"(int_add_ovf|int_add|int_sub_ovf|int_sub|int_mul_ovf|int_mul|int_rshift|int_and|int_or|int_xor|"
+ r"int_eq|int_ne|int_ge|int_gt|int_le|int_lt|int_is_zero|int_is_true|"
r"uint_floordiv|"
+ r"uint_ge|uint_lt|"
r"float_add|float_sub|float_mul|float_truediv|"
r"float_eq|float_ne|float_gt|"
r"ptr_eq|"
r"force_token|"
r"call_may_force|call_assembler|call|"
- r"new_with_vtable|new_array|newstr|new|"
+ r"new_with_vtable|new_array|newstr|newunicode|new|"
r"arraylen_gc|"
r"getarrayitem_gc_pure|getarrayitem_gc|setarrayitem_gc|getarrayitem_raw|setarrayitem_raw|"
r"getfield_gc_pure|getfield_gc|getfield_raw|setfield_gc|setfield_raw|"
- r"strlen|copystrcontents|"
+ r"strgetitem|strsetitem|strlen|copystrcontent|"
+ r"unicodegetitem|unicodesetitem|unicodelen"
r"guard_true|guard_false|guard_value|guard_isnull|guard_nonnull_class|guard_nonnull|guard_class|guard_no_overflow|guard_not_forced|guard_no_exception|guard_not_invalidated)", Name.Builtin),
include("extra-stuff"),
],