[PATCH] D30740: Remove a useless subsitution in doxygen2rst which was incorrectly replacing * by \*

[Sylvestre Ledru via Phabricator via cfe-commits]

sylvestre.ledru created this revision.

For example, "int\* a;" is displayed instead of "int* a;"


https://reviews.llvm.org/D30740

Files:
  docs/ClangFormatStyleOptions.rst
  docs/tools/dump_format_style.py


Index: docs/ClangFormatStyleOptions.rst
===================================================================
--- docs/ClangFormatStyleOptions.rst
+++ docs/ClangFormatStyleOptions.rst
@@ -585,7 +585,7 @@
 
 **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 @@
         Priority:        2
       - Regex:           '^(<|"(gtest|isl|json)/)'
         Priority:        3
-      - Regex:           '.\*'
+      - Regex:           '.*'
         Priority:        1
 
 **IncludeIsMainRegex** (``std::string``)
@@ -804,7 +804,7 @@
 
     .. code-block:: c++
 
-      int\* a;
+      int* a;
 
   * ``PAS_Right`` (in configuration: ``Right``)
     Align pointer to the right.
@@ -811,7 +811,7 @@
 
     .. code-block:: c++
 
-      int \*a;
+      int *a;
 
   * ``PAS_Middle`` (in configuration: ``Middle``)
     Align pointer in the middle.
@@ -818,7 +818,7 @@
 
     .. code-block:: c++
 
-      int \* a;
+      int * a;
 
 
 
Index: docs/tools/dump_format_style.py
===================================================================
--- docs/tools/dump_format_style.py
+++ docs/tools/dump_format_style.py
@@ -19,7 +19,6 @@
   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)



Index: docs/ClangFormatStyleOptions.rst
===================================================================
--- docs/ClangFormatStyleOptions.rst
+++ docs/ClangFormatStyleOptions.rst
@@ -585,7 +585,7 @@
 
 **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 @@
         Priority:        2
       - Regex:           '^(<|"(gtest|isl|json)/)'
         Priority:        3
-      - Regex:           '.\*'
+      - Regex:           '.*'
         Priority:        1
 
 **IncludeIsMainRegex** (``std::string``)
@@ -804,7 +804,7 @@
 
     .. code-block:: c++
 
-      int\* a;
+      int* a;
 
   * ``PAS_Right`` (in configuration: ``Right``)
     Align pointer to the right.
@@ -811,7 +811,7 @@
 
     .. code-block:: c++
 
-      int \*a;
+      int *a;
 
   * ``PAS_Middle`` (in configuration: ``Middle``)
     Align pointer in the middle.
@@ -818,7 +818,7 @@
 
     .. code-block:: c++
 
-      int \* a;
+      int * a;
 
 
 
Index: docs/tools/dump_format_style.py
===================================================================
--- docs/tools/dump_format_style.py
+++ docs/tools/dump_format_style.py
@@ -19,7 +19,6 @@
   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)

_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits