diff options
author | Tim Hatch <tim@timhatch.com> | 2012-03-09 12:06:19 -0800 |
---|---|---|
committer | Tim Hatch <tim@timhatch.com> | 2012-03-09 12:06:19 -0800 |
commit | 6b7349b7279cb06dd4f8a1020fa2b3d8dc66a34a (patch) | |
tree | f2ca44850a85cc25ab8d758cf9904a112a921a80 | |
parent | c91c3ff7df0688be4f51888d45322969cecb9090 (diff) | |
download | pygments-6b7349b7279cb06dd4f8a1020fa2b3d8dc66a34a.tar.gz |
Minor lint fixes
---
pygments/lexers/other.py | 12 ++++++------
pygments/lexers/shell.py | 6 +++---
pygments/lexers/sql.py | 8 ++++----
3 files changed, 13 insertions(+), 13 deletions(-)
-rw-r--r-- | pygments/lexers/other.py | 12 | ||||
-rw-r--r-- | pygments/lexers/shell.py | 6 | ||||
-rw-r--r-- | pygments/lexers/sql.py | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/pygments/lexers/other.py b/pygments/lexers/other.py index 7af85712..bb5933df 100644 --- a/pygments/lexers/other.py +++ b/pygments/lexers/other.py @@ -2608,7 +2608,7 @@ class SnobolLexer(RegexLexer): # ASCII equivalents of original operators # | for the EBCDIC equivalent, ! likewise # \ for EBCDIC negation - (r'\*\*|[\?\$\.!%\*/#+\-@\|&\\!=]', Operator), + (r'\*\*|[\?\$\.!%\*/#+\-@\|&\\=]', Operator), (r'"[^"]*"', String), (r"'[^']*'", String), # Accept SPITBOL syntax for real numbers @@ -3244,8 +3244,8 @@ class OpenEdgeLexer(RegexLexer): (r'[0-9][0-9]*\.[0-9]+([eE][0-9]+)?[fd]?', Number.Float), (r'[0-9]+', Number.Integer), (r'\s+', Text), - (r'[\\+\\-\\*\\/\\=]', Operator), - (r'[\\.\\:\\(\\)]', Punctuation), + (r'[+*/=-]', Operator), + (r'[.:()]', Punctuation), (r'.', Name.Variable), # Lazy catch-all ], 'comment': [ @@ -3279,7 +3279,7 @@ class BroLexer(RegexLexer): tokens = { 'root': [ # Whitespace - ('^@.*?\n', Comment.Preproc), + (r'^@.*?\n', Comment.Preproc), (r'#.*?\n', Comment.Single), (r'\n', Text), (r'\s+', Text), @@ -3315,8 +3315,8 @@ class BroLexer(RegexLexer): (r'/', String.Regex, 'regex'), (r'"', String, 'string'), # Operators - (r'[!%*/+-:<=>?~|]', Operator), - (r'([-+=&|]{2}|[+-=!><]=)', Operator), + (r'[!%*/+:<=>?~|-]', Operator), + (r'([-+=&|]{2}|[+=!><-]=)', Operator), (r'(in|match)\b', Operator.Word), (r'[{}()\[\]$.,;]', Punctuation), # Identfier diff --git a/pygments/lexers/shell.py b/pygments/lexers/shell.py index 8c78d158..06700f3e 100644 --- a/pygments/lexers/shell.py +++ b/pygments/lexers/shell.py @@ -67,7 +67,7 @@ class BashLexer(RegexLexer): (r"(?s)\$?'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single), (r';', Text), (r'\s+', Text), - (r'[^=\s\n\[\]{}()$"\'`\\<]+', Text), + (r'[^=\s\[\]{}()$"\'`\\<]+', Text), (r'\d+(?= |\Z)', Number), (r'\$#?(\w+|.)', Name.Variable), (r'<', Text), @@ -251,7 +251,7 @@ class TcshLexer(RegexLexer): (r'(?s)"(\\\\|\\[0-7]+|\\.|[^"\\])*"', String.Double), (r"(?s)'(\\\\|\\[0-7]+|\\.|[^'\\])*'", String.Single), (r'\s+', Text), - (r'[^=\s\n\[\]{}()$"\'`\\]+', Text), + (r'[^=\s\[\]{}()$"\'`\\]+', Text), (r'\d+(?= |\Z)', Number), (r'\$#?(\w+|.)', Name.Variable), ], @@ -315,7 +315,7 @@ class PowerShellLexer(RegexLexer): commenthelp = ( 'component description example externalhelp forwardhelpcategory ' - 'forwardhelptargetname forwardhelptargetname functionality inputs link ' + 'forwardhelptargetname functionality inputs link ' 'notes outputs parameter remotehelprunspace role synopsis').split() tokens = { diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py index d5444fcb..656d29a7 100644 --- a/pygments/lexers/sql.py +++ b/pygments/lexers/sql.py @@ -147,14 +147,14 @@ class PostgresLexer(PostgresBase, RegexLexer): for s in DATATYPES + PSEUDO_TYPES]) + r')\b', Name.Builtin), (r'(' + '|'.join(KEYWORDS) + r')\b', Keyword), - (r'[+*/<>=~!@#%^&|`?^-]+', Operator), + (r'[+*/<>=~!@#%^&|`?-]+', Operator), (r'::', Operator), # cast (r'\$\d+', Name.Variable), (r'([0-9]*\.[0-9]*|[0-9]+)(e[+-]?[0-9]+)?', Number.Float), (r'[0-9]+', Number.Integer), (r"(E|U&)?'(''|[^'])*'", String.Single), (r'(U&)?"(""|[^"])*"', String.Name), # quoted identifier - (r'(?ms)(\$[^\$]*\$)(.*?)(\1)', language_callback), + (r'(?s)(\$[^\$]*\$)(.*?)(\1)', language_callback), (r'[a-zA-Z_][a-zA-Z0-9_]*', Name), # psql variable in SQL @@ -434,7 +434,7 @@ class SqlLexer(RegexLexer): r'DEC|DECIMAL|FLOAT|INT|INTEGER|INTERVAL|NUMBER|NUMERIC|REAL|' r'SERIAL|SMALLINT|VARCHAR|VARYING|INT8|SERIAL8|TEXT)\b', Name.Builtin), - (r'[+*/<>=~!@#%^&|`?^-]', Operator), + (r'[+*/<>=~!@#%^&|`?-]', Operator), (r'[0-9]+', Number.Integer), # TODO: Backslash escapes? (r"'(''|[^'])*'", String.Single), @@ -472,7 +472,7 @@ class MySqlLexer(RegexLexer): (r"'(''|[^'])*'", String.Single), (r'"(""|[^"])*"', String.Double), (r"`(``|[^`])*`", String.Symbol), - (r'[+*/<>=~!@#%^&|`?^-]', Operator), + (r'[+*/<>=~!@#%^&|`?-]', Operator), (r'\b(tinyint|smallint|mediumint|int|integer|bigint|date|' r'datetime|time|bit|bool|tinytext|mediumtext|longtext|text|' r'tinyblob|mediumblob|longblob|blob|float|double|double\s+' |