diff options
| author | Armin Ronacher <armin.ronacher@active-4.com> | 2011-09-22 11:17:18 +0200 |
|---|---|---|
| committer | Armin Ronacher <armin.ronacher@active-4.com> | 2011-09-22 11:17:18 +0200 |
| commit | 91e0bf99abb0ebe896ecc4e26951f857f87076ee (patch) | |
| tree | cb9478f182c483b1da911b2e5d6e538275ff7dfa /sphinx/domains/cpp.py | |
| parent | e18d423f0adac717d8e6a8d6ed9fad5bca7f0933 (diff) | |
| download | sphinx-91e0bf99abb0ebe896ecc4e26951f857f87076ee.tar.gz | |
Added support for strings with commas in template definitions.
Diffstat (limited to 'sphinx/domains/cpp.py')
| -rw-r--r-- | sphinx/domains/cpp.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sphinx/domains/cpp.py b/sphinx/domains/cpp.py index ecae79f6..d0c62bc7 100644 --- a/sphinx/domains/cpp.py +++ b/sphinx/domains/cpp.py @@ -29,7 +29,7 @@ _string_re = re.compile(r"[LuU8]?('([^'\\]*(?:\\.[^'\\]*)*)'" r'|"([^"\\]*(?:\\.[^"\\]*)*)")', re.S) _visibility_re = re.compile(r'\b(public|private|protected)\b') _array_def_re = re.compile(r'\[\s*(.+?)?\s*\]') -_template_arg_re = re.compile(r'[^,>]+') +_template_arg_re = re.compile(r'(%s)|([^,>]+)' % _string_re.pattern, re.S) _operator_re = re.compile(r'''(?x) \[\s*\] | \(\s*\) |