diff options
| author | gbrandl <devnull@localhost> | 2007-01-12 15:53:28 +0100 |
|---|---|---|
| committer | gbrandl <devnull@localhost> | 2007-01-12 15:53:28 +0100 |
| commit | efaccf6fd1322930aca142dd1a96d06d1bae84a3 (patch) | |
| tree | f6aa6dcc5167601a07b7e10a9ab27d26fc47de9d | |
| parent | 65750ddadbe26b140083030b6ac062e1af4a79b0 (diff) | |
| download | pygments-efaccf6fd1322930aca142dd1a96d06d1bae84a3.tar.gz | |
[svn] Make check.
| -rw-r--r-- | pygments/lexer.py | 1 | ||||
| -rw-r--r-- | pygments/lexers/other.py | 4 | ||||
| -rw-r--r-- | pygments/lexers/templates.py | 9 | ||||
| -rw-r--r-- | pygments/styles/fruity.py | 3 |
4 files changed, 10 insertions, 7 deletions
diff --git a/pygments/lexer.py b/pygments/lexer.py index 3b48243a..3647981d 100644 --- a/pygments/lexer.py +++ b/pygments/lexer.py @@ -594,4 +594,3 @@ def do_insertions(insertions, tokens): if insleft: for item in itokens: yield item - diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py index 37e5b18e..cede911f 100644 --- a/pygments/lexers/other.py +++ b/pygments/lexers/other.py @@ -113,9 +113,9 @@ class SqlLexer(RegexLexer): Name.Builtin), (r'[+*/<>=~!@#%^&|`?^-]', Operator), (r'[0-9]+', Number.Integer), - # TODO: Backslash escapes? + # TODO: Backslash escapes? (r"'(''|[^'])*'", String.Single), - (r'"(""|[^"])*"', String.Symbol), # not a real string literal in ANSI SQL + (r'"(""|[^"])*"', String.Symbol), # not a real string literal in ANSI SQL (r"`(``|[^`])*`", String.Backtick), (r'[a-zA-Z_][a-zA-Z0-9_]*', Name), (r'[;:()\[\],\.]', Punctuation) diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py index 694b85d2..3efb3ba5 100644 --- a/pygments/lexers/templates.py +++ b/pygments/lexers/templates.py @@ -314,10 +314,13 @@ class MakoLexer(RegexLexer): bygroups(Text, Comment.Preproc, using(PythonLexer), Other)), (r'(\s*)(#[^\n]*)(\n|\Z)', bygroups(Text, Comment.Preproc, Other)), - (r'(<%)(def|call|namespace|text)', bygroups(Comment.Preproc, Name.Builtin), 'tag'), - (r'(</%)(def|call|namespace|text)(>)', bygroups(Comment.Preproc, Name.Builtin, Comment.Preproc)), + (r'(<%)(def|call|namespace|text)', + bygroups(Comment.Preproc, Name.Builtin), 'tag'), + (r'(</%)(def|call|namespace|text)(>)', + bygroups(Comment.Preproc, Name.Builtin, Comment.Preproc)), (r'<%(?=(include|inherit|namespace|page))', Comment.Preproc, 'ondeftags'), - (r'(<%(?:!?))(.*?)(%>)(?s)', bygroups(Comment.Preproc, using(PythonLexer), Comment.Preproc)), + (r'(<%(?:!?))(.*?)(%>)(?s)', + bygroups(Comment.Preproc, using(PythonLexer), Comment.Preproc)), (r'(\$\{)(.*?)(\})', bygroups(Comment.Preproc, using(PythonLexer), Comment.Preproc)), (r'''(?sx) diff --git a/pygments/styles/fruity.py b/pygments/styles/fruity.py index b2991b9c..a6da42bb 100644 --- a/pygments/styles/fruity.py +++ b/pygments/styles/fruity.py @@ -10,7 +10,8 @@ """ from pygments.style import Style -from pygments.token import Token, Comment, Name, Keyword, Generic, Number, Operator, String +from pygments.token import Token, Comment, Name, Keyword, \ + Generic, Number, Operator, String class FruityStyle(Style): |