Merge pull request #253 from andreaskeller96/fix/correctly-resolve-ca…

…rriage-return Fix not checking for \r\n when parsing line comments
ToruNiina · Jul 10, 2024 · d8d3257 · d8d3257
2 parents 5ac47b8 + 143437d
commit d8d3257
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/include/toml11/parser.hpp b/include/toml11/parser.hpp
@@ -1855,7 +1855,14 @@ skip_multiline_spacer(location& loc, context<TC>& ctx, const bool newline_found
         {
             spacer.newline_found = true;
             auto comment = comm.as_string();
-            if( ! comment.empty() && comment.back() == '\n') {comment.pop_back();}
+            if( ! comment.empty() && comment.back() == '\n')
+            {
+                comment.pop_back();
+                if (!comment.empty() && comment.back() == '\r')
+                {
+                    comment.pop_back();
+                }
+            }
 
             spacer.comments.push_back(std::move(comment));
             spacer.indent_type = indent_char::none;