|DIR with header and footer output; INSTR with empty search string; ROUND for negative numbers fixed; USING with escape character "_"; WRITE: allow also semicolon as separator; test page extended; no warning for unknown RSX during compile time

Author: benchmarko

BasicParser.js

@@ -1500,6 +1500,26 @@ BasicParser.prototype = {
 			return fnCreateCmdCall(sName);
 		});
 
+		stmt("write", function () {
+			var oNode = oPreviousToken,
+				mCloseTokens = BasicParser.mCloseTokens,
+				oStream = fnGetOptionalStream();
+
+			if (oStream.len !== 0) { // not an inserted stream?
+				if (!mCloseTokens[oToken.type]) {
+					advance(",");
+				}
+			}
+
+			oNode.args = fnGetArgsSepByCommaSemi();
+			oNode.args.unshift(oStream);
+
+			if ((oPreviousToken.type === "," && oNode.args.length > 1) || oPreviousToken.type === ";") {
+				throw that.composeError(Error(), "Operand missing", oPreviousToken.type, oPreviousToken.pos);
+			}
+			return oNode;
+		});
+
 
 		// line
 		this.sLine = "0"; // for error messages

CodeGeneratorJs.js

@@ -449,7 +449,7 @@ CodeGeneratorJs.prototype = {
 				},
 
 				"|": function (node) { // rsx
-					var sRsxName, bRsxAvailable, aNodeArgs, sLabel, oError;
+					var sRsxName, bRsxAvailable, aNodeArgs, sLabel;
 
 					sRsxName = node.value.substr(1).toLowerCase().replace(/\./g, "_");
 					bRsxAvailable = that.rsx && that.rsx.rsxIsAvailable(sRsxName);
@@ -458,10 +458,6 @@ CodeGeneratorJs.prototype = {
 					that.iStopCount += 1;
 
 					if (!bRsxAvailable) { // if RSX not available, we delay the error until it is executed (or catched by on error goto)
-						if (!that.bQuiet) {
-							oError = that.composeError(Error(), "Unknown RSX command", node.value, node.pos);
-							Utils.console.warn(oError);
-						}
 						aNodeArgs.unshift('"' + sRsxName + '"'); // put as first arg
 						sRsxName = "rsxExec"; // and call special handler which triggers error if not available
 					}

Controller.js

@@ -706,12 +706,12 @@ Controller.prototype = {
 			aDir.sort();
 		}
 
-		this.oVm.print(iStream, "\r\n");
+		this.oVm.print(iStream, "\r\nDrive A: user  0\r\n\r\n");
 		for (i = 0; i < aDir.length; i += 1) {
 			sKey = aDir[i] + "  ";
 			this.oVm.print(iStream, sKey);
 		}
-		this.oVm.print(iStream, "\r\n");
+		this.oVm.print(iStream, "\r\n\r\n999K free\r\n\r\n");
 	},
 
 	fnFileCat: function (oParas) {

CpcVm.js

@@ -1864,13 +1864,20 @@ CpcVm.prototype = {
 	},
 
 	instr: function (p1, p2, p3) { // optional startpos as first parameter
-		this.vmAssertString(p2, "INSTR");
-		if (typeof p1 === "string") { // p1=string, p2=search string
-			return p1.indexOf(p2) + 1;
+		var startPos = typeof p1 === "number" ? this.vmInRangeRound(p1, 1, 255, "INSTR") - 1 : 0, // p1=startpos
+			str = typeof p1 === "number" ? p2 : p1,
+			search = typeof p1 === "number" ? p3 : p2;
+
+		this.vmAssertString(str, "INSTR");
+		this.vmAssertString(search, "INSTR");
+
+		if (startPos >= str.length) {
+			return 0; // not found
+		}
+		if (!search.length) {
+			return startPos + 1;
 		}
-		p1 = this.vmInRangeRound(p1, 1, 255, "INSTR"); // p1=startpos
-		this.vmAssertString(p3, "INSTR");
-		return p2.indexOf(p3, p1 - 1) + 1; // p2=string, p3=search string
+		return str.indexOf(search, startPos) + 1;
 	},
 
 	"int": function (n) {
@@ -3104,11 +3111,19 @@ CpcVm.prototype = {
 	},
 
 	round: function (n, iDecimals) {
+		var iMaxDecimals = 20 - Math.floor(Math.log10(n)); // limit for JS
+
 		this.vmAssertNumber(n, "ROUND");
 		iDecimals = this.vmInRangeRound(iDecimals || 0, -39, 39, "ROUND");
 
+		if (iDecimals >= 0 && iDecimals > iMaxDecimals) {
+			iDecimals = iMaxDecimals;
+		}
+
 		// To avoid rounding errors: https://www.jacklmoore.com/notes/rounding-in-javascript
-		return Number(Math.round(Number(n + "e" + iDecimals)) + "e" + ((iDecimals >= 0) ? "-" + iDecimals : "+" + -iDecimals));
+		// Use Math.abs(n) and Math.sign(n) To round negative numbers to larger negative numbers
+		return Math.sign(n) * Number(Math.round(Number(Math.abs(n) + "e" + iDecimals)) + "e" + ((iDecimals >= 0) ? "-" + iDecimals : "+" + -iDecimals));
+		//return Number(Math.round(Number(n + "e" + iDecimals)) + "e" + ((iDecimals >= 0) ? "-" + iDecimals : "+" + -iDecimals));
 	},
 
 	vmRunCallback: function (sInput, oMeta) {
@@ -3470,22 +3485,44 @@ CpcVm.prototype = {
 	},
 
 	using: function (sFormat) { // varargs
-		var reFormat = /(!|&|\\ *\\|(?:\*\*|\$\$|\*\*\$)?\+?(?:#|,)+\.?#*(?:\^\^\^\^)?[+-]?)/g,
+		var reFormat = /(_|!|&|\\ *\\|(?:\*\*|\$\$|\*\*\$)?\+?(?:#|,)+\.?#*(?:\^\^\^\^)?[+-]?)/g,
 			s = "",
 			aFormat = [],
-			iIndex,	oMatch,	sFrmt, iFormat, i, arg;
+			iIndex,	aMatch,	sFrmt, iFormat, i, arg, nonFormChars, nonFormCharsEnd;
 
 		this.vmAssertString(sFormat, "USING");
 
 		// We simulate sFormat.split(reFormat) here since it does not work with IE8
 		iIndex = 0;
-		while ((oMatch = reFormat.exec(sFormat)) !== null) {
-			aFormat.push(sFormat.substring(iIndex, oMatch.index)); // non-format characters at the beginning
-			aFormat.push(oMatch[0]);
-			iIndex = oMatch.index + oMatch[0].length;
+		while ((aMatch = reFormat.exec(sFormat)) !== null) {
+			nonFormChars = sFormat.substring(iIndex, aMatch.index); // non-format characters at the beginning
+
+			if (aMatch[0] === "_") { // underscore "_" is escape character
+				nonFormChars += sFormat.charAt(aMatch.index + 1) || "_"; // add escaped character
+			}
+
+			if (aFormat.length % 2) { // odd?
+				aFormat[aFormat.length - 1] += nonFormChars;
+			} else {
+				aFormat.push(nonFormChars);
+			}
+
+			if (aMatch[0] === "_") { // underscore "_" is escape character
+				reFormat.lastIndex += 1;
+				iIndex = reFormat.lastIndex;
+			} else {
+				aFormat.push(aMatch[0]);
+				iIndex = aMatch.index + aMatch[0].length;
+			}
 		}
 		if (iIndex < sFormat.length) { // non-format characters at the end
-			aFormat.push(sFormat.substr(iIndex));
+			nonFormCharsEnd = sFormat.substring(iIndex);
+
+			if (aFormat.length % 2) { // odd?
+				aFormat[aFormat.length - 1] += nonFormCharsEnd;
+			} else {
+				aFormat.push(nonFormCharsEnd);
+			}
 		}
 
 		if (aFormat.length < 2) {