Polyfill for Array.filter; MERGE with different line separators

benchmarko · benchmarko · commit 5d75124f964e · 2024-05-26T21:12:50.000+02:00
diff --git a/Controller.js b/Controller.js
@@ -561,26 +561,31 @@ Controller.prototype = {
 		}
 	},
 
+	// We simulate input.split(/^(\s*\d+)/m) here since it does not work with IE8
+	// (see also: https://blog.stevenlevithan.com/archives/cross-browser-split )
+	// This function also works for different line separators (IE8 textArea stores "\r\n" as line separator)
 	splitLines: function (input) {
-		var lines = [],
-			lineParts = input.split(/^(\s*\d+)/m), // get numbers starting at the beginning of a line
-			i, number, content;
-
-		if (lineParts[0] === "") {
-			lineParts.shift(); // remove first empty item
-		}
-
-		for (i = 0; i < lineParts.length; i += 2) {
-			number = lineParts[i];
-			content = lineParts[i + 1];
-
-			if (content.endsWith("\n")) {
-				content = content.substring(0, content.length - 1);
+		var reFormat = new RegExp("\\r?\\n(\\d+)", "g"),
+			aOutput = [],
+			aMatch, iLastIndex, iLastLastIndex;
+
+		input = "\n" + input;
+		while ((aMatch = reFormat.exec(input)) !== null) {
+			iLastIndex = aMatch.index + aMatch[0].length; // separator.lastIndex is not reliable cross-browser
+			if (iLastIndex > iLastLastIndex) {
+				aOutput[aOutput.length - 1] += input.slice(iLastLastIndex, aMatch.index);
+			}
+			aOutput.push(aMatch[1]);
+			iLastLastIndex = iLastIndex;
+		}
+		if (iLastLastIndex < input.length) {
+			if (aOutput.length) {
+				aOutput[aOutput.length - 1] += input.slice(iLastLastIndex);
+			} else {
+				aOutput.push(input.slice(iLastLastIndex));
 			}
-			lines.push(number + content);
 		}
-
-		return lines;
+		return aOutput;
 	},
 
 	// merge two scripts with sorted line numbers, lines from script2 overwrite lines from script1
diff --git a/Polyfills.js b/Polyfills.js
@@ -42,6 +42,20 @@ if ((typeof globalThis !== "undefined") && !globalThis.window) { // nodeJS
 	globalThis.window = {};
 }
 
+if (!Array.prototype.filter) { // IE8
+	Array.prototype.filter = function (callbackFn) { // eslint-disable-line no-extend-native
+		var arr = [],
+			i;
+
+		for (i = 0; i < this.length; i += 1) {
+			if (callbackFn.call(this, this[i], i, this)) {
+				arr.push(this[i]);
+			}
+		}
+		return arr;
+	};
+}
+
 if (!Array.prototype.indexOf) { // IE8
 	Array.prototype.indexOf = function (element, iFrom) { // eslint-disable-line no-extend-native
 		var iLen = this.length >>> 0; // eslint-disable-line no-bitwise
diff --git a/index.html b/index.html
@@ -4,7 +4,7 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <link rel="stylesheet" href="cpcbasic.css" />
-<title id="title">CPC Basic v0.10.13</title>
+<title id="title">CPC Basic v0.10.14</title>
 </head>
 
 <body id="pageBody">
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cpcbasic",
-  "version": "0.10.13",
+  "version": "0.10.14",
   "description": "# CPCBasic - Run CPC BASIC in a Browser",
   "main": "cpcbasic.js",
   "directories": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cpcbasic",`
`3`		`- "version": "0.10.13",`
	`3`	`+ "version": "0.10.14",`
`4`	`4`	`"description": "# CPCBasic - Run CPC BASIC in a Browser",`
`5`	`5`	`"main": "cpcbasic.js",`
`6`	`6`	`"directories": {`