# HG changeset patch # User Jordan Miner # Date 1358650631 21600 # Node ID 8ba1044adc938fcc00202123ec701dc0a27d548a # Parent 6613b65a6035f2dfa133dfade6e6278f34e52363 Rename Newline.Macintosh/Linux to better names. CR is not used on Mac since before OS X. And LF is not just used on Linux, but other Unix systems too. diff -r 6613b65a6035 -r 8ba1044adc93 dynamin/core/string.d --- a/dynamin/core/string.d Sat Jan 19 20:51:27 2013 -0600 +++ b/dynamin/core/string.d Sat Jan 19 20:57:11 2013 -0600 @@ -217,9 +217,9 @@ /// Crlf = 2, /// - Macintosh = 0, + ClassicMacOS = 0, /// - Linux = 1, + Unix = 1, /// Windows = 2 } @@ -229,7 +229,7 @@ * ----- * "\r\n\n\r".convertNewlines(Newline.Lf) == "\n\n\n" * "\r\n\n\r".convertNewlines(Newline.Windows) == "\r\n\r\n\r\n" - * "\n\r\n".convertNewlines(Newline.Macintosh) == "\r\r" + * "\n\r\n".convertNewlines(Newline.ClassicMacOS) == "\r\r" * ----- */ mstring convertNewlines(cstring str, Newline nl, mstring buffer = null) { // TODO: use buffer @@ -244,7 +244,7 @@ unittest { assert("\r\n\n\r".convertNewlines(Newline.Lf) == "\n\n\n"); assert("\r\n\n\r".convertNewlines(Newline.Windows) == "\r\n\r\n\r\n"); - assert("\n\r\n".convertNewlines(Newline.Macintosh) == "\r\r"); + assert("\n\r\n".convertNewlines(Newline.ClassicMacOS) == "\r\r"); } /**