From 64a83a038e47773f801ccba8eb50fc85ab535d2c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 9 Mar 2017 06:41:08 +0000 Subject: [PATCH] Remove a useless subsitution in doxygen2rst which was incorrectly replacing * by \* Summary: For example, "int\* a;" is displayed instead of "int* a;" Reviewers: djasper Reviewed By: djasper Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D30740 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@297363 91177308-0d34-0410-b5e6-96231b3b80d8 --- docs/ClangFormatStyleOptions.rst | 10 +++++----- docs/tools/dump_format_style.py | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/ClangFormatStyleOptions.rst b/docs/ClangFormatStyleOptions.rst index 98211c421b..efc3612b3e 100644 --- a/docs/ClangFormatStyleOptions.rst +++ b/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/docs/tools/dump_format_style.py b/docs/tools/dump_format_style.py index 6e14939498..d65024fdba 100755 --- a/docs/tools/dump_format_style.py +++ b/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'\s*(.*?)\s*<\/tt>', r'``\1``', text) text = re.sub(r'\\c ([^ ,;\.]+)', r'``\1``', text) text = re.sub(r'\\\w+ ', '', text) -- 2.40.0