diff options
| author | Georg Brandl <georg@python.org> | 2014-09-20 00:06:48 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-09-20 00:06:48 +0200 |
| commit | 3aa632c6c357746459a8847feb056cc3c86db93c (patch) | |
| tree | 3b285fdac519a208586a72ad2fa8ce0fcf0993d8 /pygments/lexers/jvm.py | |
| parent | 827f32f543bd55ad65d01acca45658169a9b4a8a (diff) | |
| parent | ed8910f067a347021854227f194f374c5b8cce2d (diff) | |
| download | pygments-3aa632c6c357746459a8847feb056cc3c86db93c.tar.gz | |
Merged in jaingaurav2/pygments-main-1011 (pull request #376)
Diffstat (limited to 'pygments/lexers/jvm.py')
| -rw-r--r-- | pygments/lexers/jvm.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py index fa05b7ed..d422f5fd 100644 --- a/pygments/lexers/jvm.py +++ b/pygments/lexers/jvm.py @@ -413,11 +413,11 @@ class GosuTemplateLexer(Lexer): aliases = ['gst'] filenames = ['*.gst'] mimetypes = ['text/x-gosu-template'] - lexer = GosuLexer() def get_tokens_unprocessed(self, text): + lexer = GosuLexer() stack = ['templateText'] - for item in self.lexer.get_tokens_unprocessed(text, stack): + for item in lexer.get_tokens_unprocessed(text, stack): yield item @@ -1219,6 +1219,7 @@ class GoloLexer(RegexLexer): (r'-?\d[\d_]*', Number.Integer), ('`?[a-zA-Z_][\w$]*', Name), + (r'@[a-zA-Z_][\w$._]*', Name.Decorator), (r'"""', String, combined('stringescape', 'triplestring')), (r'"', String, combined('stringescape', 'doublestring')), |