diff options
Diffstat (limited to 'clang/docs')
| -rw-r--r-- | clang/docs/ClangFormatStyleOptions.rst | 10 | ||||
| -rwxr-xr-x | clang/docs/tools/dump_format_style.py | 1 |
2 files changed, 5 insertions, 6 deletions
diff --git a/clang/docs/ClangFormatStyleOptions.rst b/clang/docs/ClangFormatStyleOptions.rst index 98211c421b7..efc3612b3ea 100644 --- a/clang/docs/ClangFormatStyleOptions.rst +++ b/clang/docs/ClangFormatStyleOptions.rst @@ -585,7 +585,7 @@ the configuration (without a prefix: ``Auto``). **DerivePointerAlignment** (``bool``) If ``true``, analyze the formatted file for the most common - alignment of ``&`` and ``\*``. ``PointerAlignment`` is then used only as + alignment of ``&`` and ``*``. ``PointerAlignment`` is then used only as fallback. **DisableFormat** (``bool``) @@ -659,7 +659,7 @@ the configuration (without a prefix: ``Auto``). Priority: 2 - Regex: '^(<|"(gtest|isl|json)/)' Priority: 3 - - Regex: '.\*' + - Regex: '.*' Priority: 1 **IncludeIsMainRegex** (``std::string``) @@ -804,21 +804,21 @@ the configuration (without a prefix: ``Auto``). .. code-block:: c++ - int\* a; + int* a; * ``PAS_Right`` (in configuration: ``Right``) Align pointer to the right. .. code-block:: c++ - int \*a; + int *a; * ``PAS_Middle`` (in configuration: ``Middle``) Align pointer in the middle. .. code-block:: c++ - int \* a; + int * a; diff --git a/clang/docs/tools/dump_format_style.py b/clang/docs/tools/dump_format_style.py index 6e149394981..d65024fdbab 100755 --- a/clang/docs/tools/dump_format_style.py +++ b/clang/docs/tools/dump_format_style.py @@ -19,7 +19,6 @@ def substitute(text, tag, contents): return re.sub(pattern, '%s', text, flags=re.S) % replacement def doxygen2rst(text): - text = re.sub(r'([^/\*])\*', r'\1\\*', text) text = re.sub(r'<tt>\s*(.*?)\s*<\/tt>', r'``\1``', text) text = re.sub(r'\\c ([^ ,;\.]+)', r'``\1``', text) text = re.sub(r'\\\w+ ', '', text) |
