r297363 - Remove a useless subsitution in doxygen2rst which was incorrectly replacing * by \*

Sylvestre Ledru via cfe-commits cfe-commits at lists.llvm.org
Wed Mar 8 22:41:08 PST 2017


Author: sylvestre
Date: Thu Mar  9 00:41:08 2017
New Revision: 297363

URL: http://llvm.org/viewvc/llvm-project?rev=297363&view=rev
Log:
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

Modified:
    cfe/trunk/docs/ClangFormatStyleOptions.rst
    cfe/trunk/docs/tools/dump_format_style.py

Modified: cfe/trunk/docs/ClangFormatStyleOptions.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/ClangFormatStyleOptions.rst?rev=297363&r1=297362&r2=297363&view=diff
==============================================================================
--- cfe/trunk/docs/ClangFormatStyleOptions.rst (original)
+++ cfe/trunk/docs/ClangFormatStyleOptions.rst Thu Mar  9 00:41:08 2017
@@ -585,7 +585,7 @@ the configuration (without a prefix: ``A
 
 **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: ``A
         Priority:        2
       - Regex:           '^(<|"(gtest|isl|json)/)'
         Priority:        3
-      - Regex:           '.\*'
+      - Regex:           '.*'
         Priority:        1
 
 **IncludeIsMainRegex** (``std::string``)
@@ -804,21 +804,21 @@ the configuration (without a prefix: ``A
 
     .. 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;
 
 
 

Modified: cfe/trunk/docs/tools/dump_format_style.py
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/tools/dump_format_style.py?rev=297363&r1=297362&r2=297363&view=diff
==============================================================================
--- cfe/trunk/docs/tools/dump_format_style.py (original)
+++ cfe/trunk/docs/tools/dump_format_style.py Thu Mar  9 00:41:08 2017
@@ -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)




More information about the cfe-commits mailing list