Merge pull request #3829 from ntrel/macro-cr

Fix Issue 13212 - Trailing Windows line endings not stripped from .ddoc macros
dlang · Aug 11, 2014 · a3a1ef0 · a3a1ef0
2 parents 5ce80cf + 35735aa
commit a3a1ef0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/doc.c b/src/doc.c
@@ -1779,6 +1779,7 @@ void DocComment::parseMacros(Escape **pescapetable, Macro **pmacrotable, const u
                     p++;
                     continue;
 
+                case '\r':
                 case '\n':
                     p++;
                     goto Lcont;
@@ -1843,14 +1844,10 @@ void DocComment::parseMacros(Escape **pescapetable, Macro **pmacrotable, const u
         textstart = p;
 
       Ltext:
-        while (p < pend && *p != '\n')
+        while (p < pend && *p != '\r' && *p != '\n')
             p++;
         textlen = p - textstart;
 
-        // Remove trailing \r if there is one
-        if (p > m && p[-1] == '\r')
-            textlen--;
-
         p++;
         //printf("p = %p, pend = %p\n", p, pend);
 
@@ -1859,8 +1856,8 @@ void DocComment::parseMacros(Escape **pescapetable, Macro **pmacrotable, const u
 
      Lskipline:
         // Ignore this line
-        while (p < pend && *p++ != '\n')
-            ;
+        while (p < pend && *p != '\r' && *p != '\n')
+            p++;
     }
 Ldone:
     if (namelen)

diff --git a/test/compilable/extra-files/ddoc3.ddoc b/test/compilable/extra-files/ddoc3.ddoc
@@ -1 +1,3 @@
-HELLO = world
+HELLO = world
+
+UNUSED=unused