diff options
| -rw-r--r-- | pygments/lexers/compiled.py | 6 | ||||
| -rw-r--r-- | pygments/lexers/web.py | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py index de48bd36..072974bd 100644 --- a/pygments/lexers/compiled.py +++ b/pygments/lexers/compiled.py @@ -729,9 +729,9 @@ class JavaLexer(RegexLexer): (r'[a-zA-Z_][a-zA-Z0-9_]*:', Name.Label), (r'[a-zA-Z_\$][a-zA-Z0-9_]*', Name), (r'[~\^\*!%&\[\]\(\)\{\}<>\|+=:;,./?-]', Operator), - (r'[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?', Number), - (r'[0-9]+L?', Number), - (r'0x[0-9a-f]+', Number), + (r'[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?', Number.Float), + (r'0x[0-9a-f]+', Number.Hex), + (r'[0-9]+L?', Number.Integer), (r'\n', Text) ], 'class': [ diff --git a/pygments/lexers/web.py b/pygments/lexers/web.py index 05622805..c4c29b7b 100644 --- a/pygments/lexers/web.py +++ b/pygments/lexers/web.py @@ -45,7 +45,7 @@ class JavascriptLexer(RegexLexer): (r'//.*?\n', Comment), (r'/\*.*?\*/', Comment), (r'/(\\\\|\\/|[^/\n])*/[gim]*', String.Regex), - (r'[~\^\*!%&<>\|+=:;,/?-\\]+', Operator), + (r'[~\^\*!%&<>\|+=:;,/?\\-]+', Operator), (r'[{}\[\]();.]+', Punctuation), (r'(for|in|while|do|break|return|continue|if|else|throw|try|' r'catch|var|with|const|label|function|new|typeof|' @@ -57,7 +57,9 @@ class JavascriptLexer(RegexLexer): r'Error|eval|isFinite|isNaN|parseFloat|parseInt|document|this|' r'window)\b', Name.Builtin), (r'[$a-zA-Z_][a-zA-Z0-9_]*', Name.Other), - (r'[0-9]+', Number), + (r'[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?', Number.Float), + (r'0x[0-9a-f]+', Number.Hex), + (r'[0-9]+', Number.Integer), (r'"(\\\\|\\"|[^"])*"', String.Double), (r"'(\\\\|\\'|[^'])*'", String.Single), ] |