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 | c4f52bea0a4b4807ea5e62ba4af197be0e2a247e (patch) | |
| tree | 55491e8f0e680b3d6a6b5b4389725c6aadad82a8 /sphinx | |
| parent | 246e7b1c52fd910cd229f6f4b38d1c5c22699af3 (diff) | |
| download | sphinx-c4f52bea0a4b4807ea5e62ba4af197be0e2a247e.tar.gz | |
Added support for strings with commas in template definitions.
Diffstat (limited to 'sphinx')
| -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 68cb6293..f616ee07 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*\) |