Fix for JoeStrout#156

.gitignore

@@ -52,3 +52,6 @@ Debug
 miniscript-cpp.dir
 *.vcxproj*
 *.sln
+
+# Tests fallout
+_*.txt

MiniScript-cpp/src/ShellIntrinsics.cpp

@@ -727,7 +727,7 @@ static IntrinsicResult intrinsic_readLines(Context *context, IntrinsicResult par
 					partialLine = "";
 				}
 				list.Add(line);
-				if (buf[i] == '\n' && i+1 < bytesRead && buf[i+1] == '\r') i++;
+				if (buf[i] == '\r' && i+1 < bytesRead && buf[i+1] == '\n') i++;
 				if (i+1 < bytesRead && buf[i+1] == 0) i++;
 				lineStart = i + 1;
 			}

MiniScript-cpp/tests/testFileReadLines.ms

@@ -0,0 +1,25 @@
+import "qa"
+
+testDir = "tests/"
+
+testFileReadLines = function
+	fn = file.child(testDir, "_cr.txt")
+	f = file.open(fn, "w")
+	f.write("a" + char(13) + "b" + char(13) + "c")
+	f.close
+	qa.assertEqual file.readLines("tests/_cr.txt"), ["a", "b", "c"]
+
+	fn = file.child(testDir, "_lf.txt")
+	f = file.open(fn, "w")
+	f.write("a" + char(10) + "b" + char(10) + "c")
+	f.close
+	qa.assertEqual file.readLines("tests/_lf.txt"), ["a", "b", "c"]
+
+	fn = file.child(testDir, "_crlf.txt")
+	f = file.open(fn, "w")
+	f.write("a" + char(13) + char(10) + "b" + char(13) + char(10) + "c")
+	f.close
+	qa.assertEqual file.readLines("tests/_crlf.txt"), ["a", "b", "c"]
+end function
+
+if refEquals(locals, globals) then testFileReadLines