diff options
| author | Georg Brandl <georg@python.org> | 2011-09-10 14:22:37 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-09-10 14:22:37 +0200 |
| commit | 8167dd34ab49f69a3de44eb8bc8625b581419e47 (patch) | |
| tree | c0dc23ef0a5a9a8b195009f08899f03b031472b4 | |
| parent | 7adb6092fee1d89daef51bcd7e6a9eed5d9b5be4 (diff) | |
| parent | 7454d6de7bb8ea3f263126108bb5dfc5b32e0b7f (diff) | |
| download | pygments-8167dd34ab49f69a3de44eb8bc8625b581419e47.tar.gz | |
merge
| -rw-r--r-- | pygments/lexers/pypylog.py | 10 | ||||
| -rw-r--r-- | pygments/lexers/web.py | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pygments/lexers/pypylog.py b/pygments/lexers/pypylog.py index 33331f03..e5f10c9f 100644 --- a/pygments/lexers/pypylog.py +++ b/pygments/lexers/pypylog.py @@ -49,14 +49,16 @@ class PyPyLogLexer(RegexLexer): (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|" - r"ind_mod|int_rshift|int_and|int_or|int_xor|int_eq|int_ne|int_ge|" - r"int_gt|int_le|int_lt|int_is_zero|int_is_true|" + r"int_floordiv|int_mod|int_lshift|int_rshift|int_and|int_or|" + r"int_xor|int_eq|int_ne|int_ge|int_gt|int_le|int_lt|int_is_zero|" + r"int_is_true|" r"uint_floordiv|uint_ge|uint_lt|" r"float_add|float_sub|float_mul|float_truediv|" - r"float_eq|float_ne|float_ge|float_gt|float_le|float_lt|" + r"float_eq|float_ne|float_ge|float_gt|float_le|float_lt|float_abs|" r"ptr_eq|" + r"cast_int_to_float|cast_float_to_int|" r"force_token|quasiimmut_field|same_as|virtual_ref_finish|virtual_ref|" - r"call_may_force|call_assembler|call_loopinvariant|call_pure|call|" + r"call_may_force|call_assembler|call_loopinvariant|call_release_gil|call_pure|call|" r"new_with_vtable|new_array|newstr|newunicode|new|" r"arraylen_gc|" r"getarrayitem_gc_pure|getarrayitem_gc|setarrayitem_gc|" diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py index 17a42d04..b998f2e7 100644 --- a/pygments/lexers/web.py +++ b/pygments/lexers/web.py @@ -68,7 +68,7 @@ class JavascriptLexer(RegexLexer): (r'(for|in|while|do|break|return|continue|switch|case|default|if|else|' r'throw|try|catch|finally|new|delete|typeof|instanceof|void|' r'this)\b', Keyword, 'slashstartsregex'), - (r'(var|with|function)\b', Keyword.Declaration, 'slashstartsregex'), + (r'(var|let|with|function)\b', Keyword.Declaration, 'slashstartsregex'), (r'(abstract|boolean|byte|char|class|const|debugger|double|enum|export|' r'extends|final|float|goto|implements|import|int|interface|long|native|' r'package|private|protected|public|short|static|super|synchronized|throws|' |