Armin Ronacher avatar Armin Ronacher committed 0fa299e

More improvements for the PyPy lexer.

Comments (0)

Files changed (1)

pygments/lexers/pypylog.py

 
             (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),
             (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"),
         ],
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.