Simplify charclasses in a few more modules

6 files changed, 33 insertions, 33 deletions

diff --git a/pygments/lexers/css.py b/pygments/lexers/css.py
index 45884558..ca65e7b7 100644
--- a/pygments/lexers/css.py
+++ b/pygments/lexers/css.py
@@ -44,7 +44,7 @@ class CssLexer(RegexLexer):
             (r'\#[\w-]+', Name.Function),
             (r'@[\w-]+', Keyword, 'atrule'),
             (r'[\w-]+', Name.Tag),
-            (r'[~\^\*!%&$\[\]\(\)<>\|+=@:;,./?-]', Operator),
+            (r'[~^*!%&$\[\]()<>|+=@:;,./?-]', Operator),
             (r'"(\\\\|\\"|[^"])*"', String.Double),
             (r"'(\\\\|\\'|[^'])*'", String.Single)
         ],
@@ -151,11 +151,11 @@ class CssLexer(RegexLexer):
             (r'\!important', Comment.Preproc),
             (r'/\*(?:.|\n)*?\*/', Comment),
             (r'\#[a-zA-Z0-9]{1,6}', Number),
-            (r'[\.-]?[0-9]*[\.]?[0-9]+(em|px|pt|pc|in|mm|cm|ex|s)\b', Number),
+            (r'[.-]?[0-9]*[.]?[0-9]+(em|px|pt|pc|in|mm|cm|ex|s)\b', Number),
             # Separate regex for percentages, as can't do word boundaries with %
-            (r'[\.-]?[0-9]*[\.]?[0-9]+%', Number),
+            (r'[.-]?[0-9]*[.]?[0-9]+%', Number),
             (r'-?[0-9]+', Number),
-            (r'[~\^\*!%&<>\|+=@:,./?-]+', Operator),
+            (r'[~^*!%&<>|+=@:,./?-]+', Operator),
             (r'[\[\]();]+', Punctuation),
             (r'"(\\\\|\\"|[^"])*"', String.Double),
             (r"'(\\\\|\\'|[^'])*'", String.Single),
@@ -269,7 +269,7 @@ common_sass_tokens = {
         (r'(-?\d+)(\%|[a-z]+)?', bygroups(Number.Integer, Keyword.Type)),
         (r'(-?\d*\.\d+)(\%|[a-z]+)?', bygroups(Number.Float, Keyword.Type)),
         (r'#\{', String.Interpol, 'interpolation'),
-        (r'[~\^\*!&%<>\|+=@:,./?-]+', Operator),
+        (r'[~^*!&%<>|+=@:,./?-]+', Operator),
         (r'[\[\]()]+', Punctuation),
         (r'"', String.Double, 'string-double'),
         (r"'", String.Single, 'string-single'),
@@ -289,7 +289,7 @@ common_sass_tokens = {
         (r'[\w-]+', Name.Tag),
         (r'#\{', String.Interpol, 'interpolation'),
         (r'&', Keyword),
-        (r'[~\^\*!&\[\]\(\)<>\|+=@:;,./?-]', Operator),
+        (r'[~^*!&\[\]()<>|+=@:;,./?-]', Operator),
         (r'"', String.Double, 'string-double'),
         (r"'", String.Single, 'string-single'),
     ],
diff --git a/pygments/lexers/html.py b/pygments/lexers/html.py
index 47c84787..bf6c97c1 100644
--- a/pygments/lexers/html.py
+++ b/pygments/lexers/html.py
@@ -137,7 +137,7 @@ class DtdLexer(RegexLexer):
         'element': [
             include('common'),
             (r'EMPTY|ANY|#PCDATA', Keyword.Constant),
-            (r'[^>\s\|()?+*,]+', Name.Tag),
+            (r'[^>\s|()?+*,]+', Name.Tag),
             (r'>', Keyword, '#pop'),
         ],
 
@@ -147,21 +147,21 @@ class DtdLexer(RegexLexer):
              Keyword.Constant),
             (r'#REQUIRED|#IMPLIED|#FIXED', Keyword.Constant),
             (r'xml:space|xml:lang', Keyword.Reserved),
-            (r'[^>\s\|()?+*,]+', Name.Attribute),
+            (r'[^>\s|()?+*,]+', Name.Attribute),
             (r'>', Keyword, '#pop'),
         ],
 
         'entity': [
             include('common'),
             (r'SYSTEM|PUBLIC|NDATA', Keyword.Constant),
-            (r'[^>\s\|()?+*,]+', Name.Entity),
+            (r'[^>\s|()?+*,]+', Name.Entity),
             (r'>', Keyword, '#pop'),
         ],
 
         'notation': [
             include('common'),
             (r'SYSTEM|PUBLIC', Keyword.Constant),
-            (r'[^>\s\|()?+*,]+', Name.Attribute),
+            (r'[^>\s|()?+*,]+', Name.Attribute),
             (r'>', Keyword, '#pop'),
         ],
     }
diff --git a/pygments/lexers/r.py b/pygments/lexers/r.py
index 0bc6a9f5..e8e8edf7 100644
--- a/pygments/lexers/r.py
+++ b/pygments/lexers/r.py
@@ -336,25 +336,25 @@ class SLexer(RegexLexer):
             (r'#.*$', Comment.Single),
         ],
         'valid_name': [
-            (r'[a-zA-Z][0-9a-zA-Z\._]*', Text),
+            (r'[a-zA-Z][\w.]*', Text),
             # can begin with ., but not if that is followed by a digit
-            (r'\.[a-zA-Z_][0-9a-zA-Z\._]*', Text),
+            (r'\.[a-zA-Z_][\w.]*', Text),
         ],
         'punctuation': [
             (r'\[{1,2}|\]{1,2}|\(|\)|;|,', Punctuation),
         ],
         'keywords': [
-            (words(builtins_base, suffix=r'(?![\w\. =])'),
+            (words(builtins_base, suffix=r'(?![\w. =])'),
              Keyword.Pseudo),
             (r'(if|else|for|while|repeat|in|next|break|return|switch|function)'
-             r'(?![\w\.])',
+             r'(?![\w.])',
              Keyword.Reserved),
             (r'(array|category|character|complex|double|function|integer|list|'
              r'logical|matrix|numeric|vector|data.frame|c)'
-             r'(?![\w\.])',
+             r'(?![\w.])',
              Keyword.Type),
             (r'(library|require|attach|detach|source)'
-             r'(?![\w\.])',
+             r'(?![\w.])',
              Keyword.Namespace)
         ],
         'operators': [
@@ -364,7 +364,7 @@ class SLexer(RegexLexer):
         'builtin_symbols': [
             (r'(NULL|NA(_(integer|real|complex|character)_)?|'
              r'letters|LETTERS|Inf|TRUE|FALSE|NaN|pi|\.\.(\.|[0-9]+))'
-             r'(?![0-9a-zA-Z\._])',
+             r'(?![\w.])',
              Keyword.Constant),
             (r'(T|F)\b', Name.Builtin.Pseudo),
         ],
diff --git a/pygments/lexers/shell.py b/pygments/lexers/shell.py
index 575e2525..1bbfd7a7 100644
--- a/pygments/lexers/shell.py
+++ b/pygments/lexers/shell.py
@@ -421,7 +421,7 @@ class PowerShellLexer(RegexLexer):
             (r'[#&.]', Comment.Multiline),
         ],
         'string': [
-            (r"`[0abfnrtv'\"\$`]", String.Escape),
+            (r"`[0abfnrtv'\"$`]", String.Escape),
             (r'[^$`"]+', String.Double),
             (r'\$\(', Punctuation, 'child'),
             (r'""', String.Double),
diff --git a/pygments/lexers/snobol.py b/pygments/lexers/snobol.py
index 97f614bd..88455f93 100644
--- a/pygments/lexers/snobol.py
+++ b/pygments/lexers/snobol.py
@@ -37,10 +37,10 @@ class SnobolLexer(RegexLexer):
         # as do labels
         'root': [
             (r'\*.*\n', Comment),
-            (r'[\+\.] ', Punctuation, 'statement'),
+            (r'[+.] ', Punctuation, 'statement'),
             (r'-.*\n', Comment),
             (r'END\s*\n', Name.Label, 'heredoc'),
-            (r'[A-Za-z\$][\w$]*', Name.Label, 'statement'),
+            (r'[A-Za-z$][\w$]*', Name.Label, 'statement'),
             (r'\s+', Text, 'statement'),
         ],
         # statement state, line after continuation or label
@@ -52,20 +52,20 @@ class SnobolLexer(RegexLexer):
              r'LEN|SPAN|BREAK|ANY|NOTANY|TAB|RTAB|REM|POS|RPOS|FAIL|FENCE|'
              r'ABORT|ARB|ARBNO|BAL|SUCCEED|INPUT|OUTPUT|TERMINAL)(?=[^\w.])',
              Name.Builtin),
-            (r'[A-Za-z][\w\.]*', Name),
+            (r'[A-Za-z][\w.]*', Name),
             # 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
             # as well as Macro SNOBOL4
-            (r'[0-9]+(?=[^\.EeDd])', Number.Integer),
+            (r'[0-9]+(?=[^.EeDd])', Number.Integer),
             (r'[0-9]+(\.[0-9]*)?([EDed][-+]?[0-9]+)?', Number.Float),
             # Goto
             (r':', Punctuation, 'goto'),
-            (r'[\(\)<>,;]', Punctuation),
+            (r'[()<>,;]', Punctuation),
         ],
         # Goto block
         'goto': [
diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py
index 91e2237c..98425cd2 100644
--- a/pygments/lexers/sql.py
+++ b/pygments/lexers/sql.py
@@ -150,18 +150,18 @@ class PostgresLexer(PostgresBase, RegexLexer):
             (r'[0-9]+', Number.Integer),
             (r"(E|U&)?'(''|[^'])*'", String.Single),
             (r'(U&)?"(""|[^"])*"', String.Name),  # quoted identifier
-            (r'(?s)(\$[^\$]*\$)(.*?)(\1)', language_callback),
+            (r'(?s)(\$[^$]*\$)(.*?)(\1)', language_callback),
             (r'[a-z_]\w*', Name),
 
             # psql variable in SQL
             (r""":(['"]?)[a-z]\w*\b\1""", Name.Variable),
 
-            (r'[;:()\[\]\{\},\.]', Punctuation),
+            (r'[;:()\[\]{},.]', Punctuation),
         ],
         'multiline-comments': [
             (r'/\*', Comment.Multiline, 'multiline-comments'),
             (r'\*/', Comment.Multiline, '#pop'),
-            (r'[^/\*]+', Comment.Multiline),
+            (r'[^/*]+', Comment.Multiline),
             (r'[/*]', Comment.Multiline)
         ],
     }
@@ -442,13 +442,13 @@ class SqlLexer(RegexLexer):
             # TODO: Backslash escapes?
             (r"'(''|[^'])*'", String.Single),
             (r'"(""|[^"])*"', String.Symbol),  # not a real string literal in ANSI SQL
-            (r'[a-z_][\w\$]*', Name),  # allow $s in strings for Oracle
-            (r'[;:()\[\],\.]', Punctuation)
+            (r'[a-z_][\w$]*', Name),  # allow $s in strings for Oracle
+            (r'[;:()\[\],.]', Punctuation)
         ],
         'multiline-comments': [
             (r'/\*', Comment.Multiline, 'multiline-comments'),
             (r'\*/', Comment.Multiline, '#pop'),
-            (r'[^/\*]+', Comment.Multiline),
+            (r'[^/*]+', Comment.Multiline),
             (r'[/*]', Comment.Multiline)
         ]
     }
@@ -516,12 +516,12 @@ class MySqlLexer(RegexLexer):
              bygroups(Name.Function, Text, Punctuation)),
             (r'[a-z_]\w*', Name),
             (r'@[a-z0-9]*[._]*[a-z0-9]*', Name.Variable),
-            (r'[;:()\[\],\.]', Punctuation)
+            (r'[;:()\[\],.]', Punctuation)
         ],
         'multiline-comments': [
             (r'/\*', Comment.Multiline, 'multiline-comments'),
             (r'\*/', Comment.Multiline, '#pop'),
-            (r'[^/\*]+', Comment.Multiline),
+            (r'[^/*]+', Comment.Multiline),
             (r'[/*]', Comment.Multiline)
         ]
     }
@@ -593,6 +593,6 @@ class RqlLexer(RegexLexer):
             (r'[A-Z_]\w*\??', Name),
             (r"'(''|[^'])*'", String.Single),
             (r'"(""|[^"])*"', String.Single),
-            (r'[;:()\[\],\.]', Punctuation)
+            (r'[;:()\[\],.]', Punctuation)
         ],
     }