diff options
| author | Jeffrey B. Arnold <jeffrey.arnold@gmail.com> | 2012-09-02 06:18:24 -0400 |
|---|---|---|
| committer | Jeffrey B. Arnold <jeffrey.arnold@gmail.com> | 2012-09-02 06:18:24 -0400 |
| commit | 0c363d7084ebd5b246c6d11e3494a3e481e91b2c (patch) | |
| tree | db247976979fda99925531d0fc48930bc49eb3bf /pygments/lexers/compiled.py | |
| parent | c216140e347feefc7ef14776fd2b0fe32740756c (diff) | |
| parent | 7c371dd21127e55cbbee5daf955a0974115fc65a (diff) | |
| download | pygments-0c363d7084ebd5b246c6d11e3494a3e481e91b2c.tar.gz | |
resolved conflict
Diffstat (limited to 'pygments/lexers/compiled.py')
| -rw-r--r-- | pygments/lexers/compiled.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/pygments/lexers/compiled.py b/pygments/lexers/compiled.py index 2eca91ba..c5c89ccc 100644 --- a/pygments/lexers/compiled.py +++ b/pygments/lexers/compiled.py @@ -2959,33 +2959,33 @@ class RustLexer(RegexLexer): (r'#\(', Comment.Preproc, 'attribute('), # Macros (r'#[A-Za-z_][A-Za-z0-9_]*\[', Comment.Preproc, 'attribute['), - (r'#[A-Za-z_][A-Za-z0-9_]*\(', Comment.Preproc, 'attribute(') + (r'#[A-Za-z_][A-Za-z0-9_]*\(', Comment.Preproc, 'attribute('), ], - 'number_lit': { - (r'(([ui](8|16|32|64)?)|(f(32|64)?))?', Keyword, '#pop') - }, - 'string': { + 'number_lit': [ + (r'(([ui](8|16|32|64)?)|(f(32|64)?))?', Keyword, '#pop'), + ], + 'string': [ (r'"', String, '#pop'), (r"""\\['"\\nrt]|\\x[0-9a-fA-F]{2}|\\[0-7]{1,3}""" r"""|\\u[0-9a-fA-F]{4}|\\U[0-9a-fA-F]{8}""", String.Escape), (r'[^\\"]+', String), - (r'\\', String) - }, - 'attribute_common': { + (r'\\', String), + ], + 'attribute_common': [ (r'"', String, 'string'), (r'\[', Comment.Preproc, 'attribute['), (r'\(', Comment.Preproc, 'attribute('), - }, - 'attribute[': { + ], + 'attribute[': [ include('attribute_common'), (r'\];?', Comment.Preproc, '#pop'), - (r'[^"\]]+', Comment.Preproc) - }, - 'attribute(': { + (r'[^"\]]+', Comment.Preproc), + ], + 'attribute(': [ include('attribute_common'), (r'\);?', Comment.Preproc, '#pop'), - (r'[^"\)]+', Comment.Preproc) - } + (r'[^"\)]+', Comment.Preproc), + ], } |