diff options
| author | Georg Brandl <georg@python.org> | 2010-01-02 23:17:05 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-01-02 23:17:05 +0100 |
| commit | ecabbecf6a3bde19b8bf5964248522652ba2eb5f (patch) | |
| tree | 6f29b50ef946a64c63b564e95d648161db6a0ae8 | |
| parent | 38dbb5576f8a570cf5743036a1860a2b01e1a7f3 (diff) | |
| download | pygments-git-ecabbecf6a3bde19b8bf5964248522652ba2eb5f.tar.gz | |
Allow newlines in string patterns.1.2.2
| -rw-r--r-- | pygments/lexers/agile.py | 4 | ||||
| -rw-r--r-- | pygments/lexers/compiled.py | 4 | ||||
| -rw-r--r-- | pygments/lexers/other.py | 10 | ||||
| -rw-r--r-- | pygments/lexers/text.py | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/pygments/lexers/agile.py b/pygments/lexers/agile.py index 7a5d5e3d..dafed5c9 100644 --- a/pygments/lexers/agile.py +++ b/pygments/lexers/agile.py @@ -1312,12 +1312,12 @@ class TclLexer(RegexLexer): ], 'string': [ (r'\[', String.Double, 'string-square'), - (r'(\\\\|\\[0-7]+|\\.|[^"\\])', String.Double), + (r'(?s)(\\\\|\\[0-7]+|\\.|[^"\\])', String.Double), (r'"', String.Double, '#pop') ], 'string-square': [ (r'\[', String.Double, 'string-square'), - (r'(\\\\|\\[0-7]+|\\.|[^\]\\])', String.Double), + (r'(?s)(\\\\|\\[0-7]+|\\.|\\\n|[^\]\\])', String.Double), (r'\]', String.Double, '#pop') ], 'brace': [ diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py index 65de0d32..e382a1b3 100644 --- a/pygments/lexers/compiled.py +++ b/pygments/lexers/compiled.py @@ -1296,8 +1296,8 @@ class FortranLexer(RegexLexer): ], 'strings': [ - (r'"(\\\\|\\[0-7]+|\\.|[^"\\])*"', String.Double), - (r"'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single), + (r'(?s)"(\\\\|\\[0-7]+|\\.|[^"\\])*"', String.Double), + (r"(?s)'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single), ], 'nums': [ diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py index 71592673..79024350 100644 --- a/pygments/lexers/other.py +++ b/pygments/lexers/other.py @@ -359,8 +359,8 @@ class BashLexer(RegexLexer): (r'&&|\|\|', Operator), ], 'data': [ - (r'\$?"(\\\\|\\[0-7]+|\\.|[^"\\])*"', String.Double), - (r"\$?'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single), + (r'(?s)\$?"(\\\\|\\[0-7]+|\\.|[^"\\])*"', String.Double), + (r"(?s)\$?'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single), (r';', Text), (r'\s+', Text), (r'[^=\s\n\[\]{}()$"\'`\\<]+', Text), @@ -745,8 +745,8 @@ class TcshLexer(RegexLexer): (r'<<\s*(\'?)\\?(\w+)[\w\W]+?\2', String), ], 'data': [ - (r'"(\\\\|\\[0-7]+|\\.|[^"\\])*"', String.Double), - (r"'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single), + (r'(?s)"(\\\\|\\[0-7]+|\\.|[^"\\])*"', String.Double), + (r"(?s)'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single), (r'\s+', Text), (r'[^=\s\n\[\]{}()$"\'`\\]+', Text), (r'\d+(?= |\Z)', Number), @@ -1164,7 +1164,7 @@ class PovrayLexer(RegexLexer): 'root': [ (r'/\*[\w\W]*?\*/', Comment.Multiline), (r'//.*\n', Comment.Single), - (r'"(?:\\.|[^"\\])+"', String.Double), + (r'(?s)"(?:\\.|[^"\\])+"', String.Double), (r'#(debug|default|else|end|error|fclose|fopen|if|ifdef|ifndef|' r'include|range|read|render|statistics|switch|undef|version|' r'warning|while|write|define|macro|local|declare)', diff --git a/pygments/lexers/text.py b/pygments/lexers/text.py index c01fd835..1d7f89fd 100644 --- a/pygments/lexers/text.py +++ b/pygments/lexers/text.py @@ -171,8 +171,8 @@ class BaseMakefileLexer(RegexLexer): (r'([a-zA-Z0-9_${}.-]+)(\s*)([!?:+]?=)([ \t]*)((?:.*\\\n|.*\n)+)', bygroups(Name.Variable, Text, Operator, Text, using(BashLexer))), # strings - (r'"(\\\\|\\.|[^"\\])*"', String.Double), - (r"'(\\\\|\\.|[^'\\])*'", String.Single), + (r'(?s)"(\\\\|\\.|[^"\\])*"', String.Double), + (r"(?s)'(\\\\|\\.|[^'\\])*'", String.Single), # targets (r'([^\n:]+)(:+)([ \t]*)', bygroups(Name.Function, Operator, Text), 'block-header'), |