summaryrefslogtreecommitdiff
path: root/pygments/lexers/jvm.py
diff options
context:
space:
mode:
authorEnrique Zamudio <alterbass@gmail.com>2012-09-26 13:28:42 -0500
committerEnrique Zamudio <alterbass@gmail.com>2012-09-26 13:28:42 -0500
commit30465b72fd88ac91d9c0ec851737be9334ff5402 (patch)
treee7ca6e4902c504da852fce762b2d8814c88eab35 /pygments/lexers/jvm.py
parent58a678a814b4e021f96558037e7212b21222f896 (diff)
downloadpygments-30465b72fd88ac91d9c0ec851737be9334ff5402.tar.gz
add CeylonLexer to __all__; move suffixes to MGTP instead of MGPT.
Diffstat (limited to 'pygments/lexers/jvm.py')
-rw-r--r--pygments/lexers/jvm.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py
index 833fdfe1..3860ac47 100644
--- a/pygments/lexers/jvm.py
+++ b/pygments/lexers/jvm.py
@@ -20,7 +20,7 @@ from pygments import unistring as uni
__all__ = ['JavaLexer', 'ScalaLexer', 'GosuLexer', 'GosuTemplateLexer',
- 'GroovyLexer', 'IokeLexer', 'ClojureLexer', 'KotlinLexer']
+ 'GroovyLexer', 'IokeLexer', 'ClojureLexer', 'KotlinLexer', 'CeylonLexer']
class JavaLexer(RegexLexer):
@@ -774,13 +774,13 @@ class CeylonLexer(RegexLexer):
(r'[a-zA-Z_][a-zA-Z0-9_]*:', Name.Label),
(r'[a-zA-Z_\$][a-zA-Z0-9_]*', Name),
(r'[~\^\*!%&\[\]\(\)\{\}<>\|+=:;,./?-]', Operator),
- (r'\d{1,3}(_\d{3})+\.\d{1,3}(_\d{3})+[kMGPTmunpf]?', Number.Float),
- (r'\d{1,3}(_\d{3})+\.[0-9]+([eE][+-]?[0-9]+)?[kMGPTmunpf]?', Number.Float),
- (r'[0-9][0-9]*\.\d{1,3}(_\d{3})+[kMGPTmunpf]?', Number.Float),
- (r'[0-9][0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[kMGPTmunpf]?', Number.Float),
+ (r'\d{1,3}(_\d{3})+\.\d{1,3}(_\d{3})+[kMGTPmunpf]?', Number.Float),
+ (r'\d{1,3}(_\d{3})+\.[0-9]+([eE][+-]?[0-9]+)?[kMGTPmunpf]?', Number.Float),
+ (r'[0-9][0-9]*\.\d{1,3}(_\d{3})+[kMGTPmunpf]?', Number.Float),
+ (r'[0-9][0-9]*\.[0-9]+([eE][+-]?[0-9]+)?[kMGTPmunpf]?', Number.Float),
(r'0x[0-9a-f]+', Number.Hex),
- (r'\d{1,3}(_\d{3})+[kMGPT]?', Number.Integer),
- (r'[0-9]+[kMGPT]?', Number.Integer),
+ (r'\d{1,3}(_\d{3})+[kMGTP]?', Number.Integer),
+ (r'[0-9]+[kMGTP]?', Number.Integer),
(r'\n', Text)
],
'class': [