diff options
-rw-r--r-- | pygments/lexer.py | 3 | ||||
-rw-r--r-- | pygments/lexers/berry.py | 4 | ||||
-rw-r--r-- | pygments/lexers/boa.py | 4 | ||||
-rw-r--r-- | pygments/lexers/configs.py | 3 | ||||
-rw-r--r-- | pygments/lexers/crystal.py | 4 | ||||
-rw-r--r-- | pygments/lexers/dylan.py | 6 | ||||
-rw-r--r-- | pygments/lexers/erlang.py | 4 | ||||
-rw-r--r-- | pygments/lexers/futhark.py | 5 | ||||
-rw-r--r-- | pygments/lexers/gdscript.py | 2 | ||||
-rw-r--r-- | pygments/lexers/haskell.py | 5 | ||||
-rw-r--r-- | pygments/lexers/javascript.py | 3 | ||||
-rw-r--r-- | pygments/lexers/php.py | 4 | ||||
-rw-r--r-- | pygments/lexers/python.py | 4 | ||||
-rw-r--r-- | pygments/lexers/ruby.py | 4 | ||||
-rw-r--r-- | pygments/lexers/shell.py | 4 | ||||
-rw-r--r-- | pygments/lexers/special.py | 5 |
16 files changed, 15 insertions, 49 deletions
diff --git a/pygments/lexer.py b/pygments/lexer.py index 27d73ee1..9e461715 100644 --- a/pygments/lexer.py +++ b/pygments/lexer.py @@ -21,8 +21,9 @@ from pygments.regexopt import regex_opt __all__ = ['Lexer', 'RegexLexer', 'ExtendedRegexLexer', 'DelegatingLexer', 'LexerContext', 'include', 'inherit', 'bygroups', 'using', 'this', - 'default', 'words'] + 'default', 'words', 'line_re'] +line_re = re.compile('.*?\n') _encoding_map = [(b'\xef\xbb\xbf', 'utf-8'), (b'\xff\xfe\0\0', 'utf-32'), diff --git a/pygments/lexers/berry.py b/pygments/lexers/berry.py index ec7ce2ed..cbdbb169 100644 --- a/pygments/lexers/berry.py +++ b/pygments/lexers/berry.py @@ -8,16 +8,12 @@ :license: BSD, see LICENSE for details. """ -import re - from pygments.lexer import RegexLexer, words, include, bygroups from pygments.token import Comment, Whitespace, Operator, Keyword, Name, \ String, Number, Punctuation __all__ = ['BerryLexer'] -line_re = re.compile('.*?\n') - class BerryLexer(RegexLexer): """ diff --git a/pygments/lexers/boa.py b/pygments/lexers/boa.py index 2cbc018d..96e34a9a 100644 --- a/pygments/lexers/boa.py +++ b/pygments/lexers/boa.py @@ -8,16 +8,12 @@ :license: BSD, see LICENSE for details. """ -import re - from pygments.lexer import RegexLexer, words from pygments.token import String, Comment, Keyword, Name, Number, Operator, \ Punctuation, Whitespace __all__ = ['BoaLexer'] -line_re = re.compile('.*?\n') - class BoaLexer(RegexLexer): """ diff --git a/pygments/lexers/configs.py b/pygments/lexers/configs.py index 992296d9..e04c722e 100644 --- a/pygments/lexers/configs.py +++ b/pygments/lexers/configs.py @@ -11,7 +11,7 @@ import re from pygments.lexer import ExtendedRegexLexer, RegexLexer, default, words, \ - bygroups, include, using + bygroups, include, using, line_re from pygments.token import Text, Comment, Operator, Keyword, Name, String, \ Number, Punctuation, Whitespace, Literal, Error, Generic from pygments.lexers.shell import BashLexer @@ -675,7 +675,6 @@ class TerraformLexer(ExtendedRegexLexer): tolerant = True # leading whitespace is always accepted lines = [] - line_re = re.compile('.*?\n') for match in line_re.finditer(ctx.text, ctx.pos): if tolerant: diff --git a/pygments/lexers/crystal.py b/pygments/lexers/crystal.py index c7f0c54d..2a0238e8 100644 --- a/pygments/lexers/crystal.py +++ b/pygments/lexers/crystal.py @@ -11,14 +11,12 @@ import re from pygments.lexer import ExtendedRegexLexer, include, bygroups, default, \ - words + words, line_re from pygments.token import Comment, Operator, Keyword, Name, String, Number, \ Punctuation, Error, Whitespace __all__ = ['CrystalLexer'] -line_re = re.compile('.*?\n') - CRYSTAL_OPERATORS = [ '!=', '!~', '!', '%', '&&', '&', '**', '*', '+', '-', '/', '<=>', '<<', '<=', '<', diff --git a/pygments/lexers/dylan.py b/pygments/lexers/dylan.py index e3a8e304..4d0acb90 100644 --- a/pygments/lexers/dylan.py +++ b/pygments/lexers/dylan.py @@ -10,7 +10,8 @@ import re -from pygments.lexer import Lexer, RegexLexer, bygroups, do_insertions, default +from pygments.lexer import Lexer, RegexLexer, bygroups, do_insertions, \ + default, line_re from pygments.token import Comment, Operator, Keyword, Name, String, \ Number, Punctuation, Generic, Literal, Whitespace @@ -259,7 +260,6 @@ class DylanConsoleLexer(Lexer): filenames = ['*.dylan-console'] mimetypes = ['text/x-dylan-console'] - _line_re = re.compile('.*?\n') _prompt_re = re.compile(r'\?| ') def get_tokens_unprocessed(self, text): @@ -267,7 +267,7 @@ class DylanConsoleLexer(Lexer): curcode = '' insertions = [] - for match in self._line_re.finditer(text): + for match in line_re.finditer(text): line = match.group() m = self._prompt_re.match(line) if m is not None: diff --git a/pygments/lexers/erlang.py b/pygments/lexers/erlang.py index d5aa0911..c14cbe56 100644 --- a/pygments/lexers/erlang.py +++ b/pygments/lexers/erlang.py @@ -11,15 +11,13 @@ import re from pygments.lexer import Lexer, RegexLexer, bygroups, words, do_insertions, \ - include, default + include, default, line_re from pygments.token import Comment, Operator, Keyword, Name, String, \ Number, Punctuation, Generic, Whitespace __all__ = ['ErlangLexer', 'ErlangShellLexer', 'ElixirConsoleLexer', 'ElixirLexer'] -line_re = re.compile('.*?\n') - class ErlangLexer(RegexLexer): """ diff --git a/pygments/lexers/futhark.py b/pygments/lexers/futhark.py index 92ea68f8..95b624d3 100644 --- a/pygments/lexers/futhark.py +++ b/pygments/lexers/futhark.py @@ -8,8 +8,6 @@ :license: BSD, see LICENSE for details. """ -import re - from pygments.lexer import RegexLexer, bygroups from pygments.token import Comment, Operator, Keyword, Name, String, \ Number, Punctuation, Whitespace @@ -18,9 +16,6 @@ from pygments import unistring as uni __all__ = ['FutharkLexer'] -line_re = re.compile('.*?\n') - - class FutharkLexer(RegexLexer): """ A Futhark lexer diff --git a/pygments/lexers/gdscript.py b/pygments/lexers/gdscript.py index 25849af2..0bfb43f4 100644 --- a/pygments/lexers/gdscript.py +++ b/pygments/lexers/gdscript.py @@ -20,8 +20,6 @@ from pygments.token import Text, Comment, Operator, Keyword, Name, String, \ __all__ = ["GDScriptLexer"] -line_re = re.compile(".*?\n") - class GDScriptLexer(RegexLexer): """ diff --git a/pygments/lexers/haskell.py b/pygments/lexers/haskell.py index 2f03174f..1840a8b2 100644 --- a/pygments/lexers/haskell.py +++ b/pygments/lexers/haskell.py @@ -11,7 +11,7 @@ import re from pygments.lexer import Lexer, RegexLexer, bygroups, do_insertions, \ - default, include, inherit + default, include, inherit, line_re from pygments.token import Text, Comment, Operator, Keyword, Name, String, \ Number, Punctuation, Generic, Whitespace from pygments import unistring as uni @@ -21,9 +21,6 @@ __all__ = ['HaskellLexer', 'HspecLexer', 'IdrisLexer', 'AgdaLexer', 'CryptolLexe 'LiterateCryptolLexer', 'KokaLexer'] -line_re = re.compile('.*?\n') - - class HaskellLexer(RegexLexer): """ A Haskell lexer based on the lexemes defined in the Haskell 98 Report. diff --git a/pygments/lexers/javascript.py b/pygments/lexers/javascript.py index 864a9043..eed71f95 100644 --- a/pygments/lexers/javascript.py +++ b/pygments/lexers/javascript.py @@ -11,7 +11,7 @@ import re from pygments.lexer import bygroups, combined, default, do_insertions, include, \ - inherit, Lexer, RegexLexer, this, using, words + inherit, Lexer, RegexLexer, this, using, words, line_re from pygments.token import Text, Comment, Operator, Keyword, Name, String, \ Number, Punctuation, Other, Generic, Whitespace from pygments.util import get_bool_opt @@ -29,7 +29,6 @@ JS_IDENT_PART = ('(?:[$' + uni.combine('Lu', 'Ll', 'Lt', 'Lm', 'Lo', 'Nl', '\u200c\u200d]|\\\\u[a-fA-F0-9]{4})') JS_IDENT = JS_IDENT_START + '(?:' + JS_IDENT_PART + ')*' -line_re = re.compile('.*?\n') class JavascriptLexer(RegexLexer): """ diff --git a/pygments/lexers/php.py b/pygments/lexers/php.py index 5a55bbe1..61d552ab 100644 --- a/pygments/lexers/php.py +++ b/pygments/lexers/php.py @@ -11,15 +11,13 @@ import re from pygments.lexer import Lexer, RegexLexer, include, bygroups, default, \ - using, this, words, do_insertions + using, this, words, do_insertions, line_re from pygments.token import Text, Comment, Operator, Keyword, Name, String, \ Number, Punctuation, Other, Generic from pygments.util import get_bool_opt, get_list_opt, shebang_matches __all__ = ['ZephirLexer', 'PsyshConsoleLexer', 'PhpLexer'] -line_re = re.compile('.*?\n') - class ZephirLexer(RegexLexer): """ diff --git a/pygments/lexers/python.py b/pygments/lexers/python.py index 6bd74a1e..b959525a 100644 --- a/pygments/lexers/python.py +++ b/pygments/lexers/python.py @@ -12,7 +12,7 @@ import re import keyword from pygments.lexer import Lexer, RegexLexer, include, bygroups, using, \ - default, words, combined, do_insertions, this + default, words, combined, do_insertions, this, line_re from pygments.util import get_bool_opt, shebang_matches from pygments.token import Text, Comment, Operator, Keyword, Name, String, \ Number, Punctuation, Generic, Other, Error @@ -22,8 +22,6 @@ __all__ = ['PythonLexer', 'PythonConsoleLexer', 'PythonTracebackLexer', 'Python2Lexer', 'Python2TracebackLexer', 'CythonLexer', 'DgLexer', 'NumPyLexer'] -line_re = re.compile('.*?\n') - class PythonLexer(RegexLexer): """ diff --git a/pygments/lexers/ruby.py b/pygments/lexers/ruby.py index 82aac360..ac4b0fa4 100644 --- a/pygments/lexers/ruby.py +++ b/pygments/lexers/ruby.py @@ -11,15 +11,13 @@ import re from pygments.lexer import Lexer, RegexLexer, ExtendedRegexLexer, include, \ - bygroups, default, LexerContext, do_insertions, words + bygroups, default, LexerContext, do_insertions, words, line_re from pygments.token import Text, Comment, Operator, Keyword, Name, String, \ Number, Punctuation, Error, Generic from pygments.util import shebang_matches __all__ = ['RubyLexer', 'RubyConsoleLexer', 'FancyLexer'] -line_re = re.compile('.*?\n') - RUBY_OPERATORS = ( '*', '**', '-', '+', '-@', '+@', '/', '%', '&', '|', '^', '`', '~', diff --git a/pygments/lexers/shell.py b/pygments/lexers/shell.py index acd78d97..be74a040 100644 --- a/pygments/lexers/shell.py +++ b/pygments/lexers/shell.py @@ -11,7 +11,7 @@ import re from pygments.lexer import Lexer, RegexLexer, do_insertions, bygroups, \ - include, default, this, using, words + include, default, this, using, words, line_re from pygments.token import Punctuation, \ Text, Comment, Operator, Keyword, Name, String, Number, Generic from pygments.util import shebang_matches @@ -21,8 +21,6 @@ __all__ = ['BashLexer', 'BashSessionLexer', 'TcshLexer', 'BatchLexer', 'PowerShellSessionLexer', 'TcshSessionLexer', 'FishShellLexer', 'ExeclineLexer'] -line_re = re.compile('.*?\n') - class BashLexer(RegexLexer): """ diff --git a/pygments/lexers/special.py b/pygments/lexers/special.py index 216dad4a..6db68a57 100644 --- a/pygments/lexers/special.py +++ b/pygments/lexers/special.py @@ -9,9 +9,8 @@ """ import ast -import re -from pygments.lexer import Lexer +from pygments.lexer import Lexer, line_re from pygments.token import Token, Error, Text, Generic from pygments.util import get_choice_opt @@ -51,8 +50,6 @@ class OutputLexer(Lexer): _ttype_cache = {} -line_re = re.compile('.*?\n') - class RawTokenLexer(Lexer): """ |