Skip to content

Commit

Permalink
Remove a useless subsitution in doxygen2rst which was incorrectly rep…
Browse files Browse the repository at this point in the history
…lacing * 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

llvm-svn: 297363
  • Loading branch information
sylvestre committed Mar 9, 2017
1 parent 5361b82 commit f3e295a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
10 changes: 5 additions & 5 deletions clang/docs/ClangFormatStyleOptions.rst
Expand Up @@ -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``)
Expand Down Expand Up @@ -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``)
Expand Down Expand Up @@ -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;



Expand Down
1 change: 0 additions & 1 deletion clang/docs/tools/dump_format_style.py
Expand Up @@ -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)
Expand Down

0 comments on commit f3e295a

Please sign in to comment.