BasicParser: comparison operators are left associative; multiline strings also in DATA; convert hex numbers>&7FFF to two's complement; Math.log10 for IE11; cpcBasic URL with index.html

Author: benchmarko

BasicLexer.js

@@ -191,6 +191,20 @@ BasicLexer.prototype = {
 					addToken("string", sToken, iStartPos + 1);
 				}
 			},
+			fnTryContinueString = function () { // There could be a LF in a string but no CR. In CPCBasic we use LF only as EOL, so we cannot detect the difference.
+				var sOut = "",
+					sChar1;
+
+				while (isNewLine(sChar)) {
+					sChar1 = testChar(1);
+					if (sChar1 !== "" && (sChar1 < "0" || sChar1 > "9")) { // heuristic: next char not a digit => continue with the string
+						sOut += advanceWhile(isNotQuotes);
+					} else {
+						break;
+					}
+				}
+				return sOut;
+			},
 			fnParseCompleteLineForData = function () { // special handling because strings in data lines need not be quoted
 				while (isNotNewLine(sChar)) {
 					if (isWhiteSpace(sChar)) {
@@ -207,6 +221,7 @@ BasicLexer.prototype = {
 							if (!that.bQuiet) {
 								Utils.console.log(that.composeError({}, "Unterminated string", sToken, iStartPos + 1).message);
 							}
+							sToken += fnTryContinueString(); // heuristic to detect an LF in the string
 						}
 						sToken = sToken.replace(/\\/g, "\\\\"); // escape backslashes
 						sToken = hexEscape(sToken);
@@ -238,20 +253,6 @@ BasicLexer.prototype = {
 						sChar = advance();
 					}
 				}
-			},
-			fnTryContinueString = function () { // There could be a LF in a string but no CR. In CPCBasic we use LF only as EOL, so we cannot detect the difference.
-				var sOut = "",
-					sChar1;
-
-				while (isNewLine(sChar)) {
-					sChar1 = testChar(1);
-					if (sChar1 !== "" && (sChar1 < "0" || sChar1 > "9")) { // heuristic: next char not a digit => continue with the string
-						sOut += advanceWhile(isNotQuotes);
-					} else {
-						break;
-					}
-				}
-				return sOut;
 			};
 
 		this.sLine = "0"; // for error messages

BasicParser.js

@@ -336,7 +336,7 @@ BasicParser.prototype = {
 					s = oSymbols[t.type];
 					advance(t.type);
 					if (!s.led) {
-						throw that.composeError(Error(), "Unexpected token", t.type, t.pos); //TTT how to get this error?
+						throw that.composeError(Error(), "Unexpected token", t.type, t.pos); // TODO: how to get this error?
 					}
 					left = s.led(left); // ...the led method is invoked on the following token (infix and suffix operators), can be recursive
 				}
@@ -520,7 +520,7 @@ BasicParser.prototype = {
 					oRange.right = oRight || fnCreateDummyArg("null"); // insert dummy for right (do not skip it)
 				} else if (oLeft) {
 					oRange = oLeft; // single line number
-					oRange.type = "linenumber"; // change type: number => linenumber //TTT
+					oRange.type = "linenumber"; // change type: number => linenumber
 				}
 
 				return oRange;
@@ -678,7 +678,7 @@ BasicParser.prototype = {
 				var aArgs;
 
 				advance("(");
-				aArgs = fnGetArgs(null); //until ")"
+				aArgs = fnGetArgs(null); // until ")"
 				advance(")");
 				return aArgs;
 			},
@@ -732,9 +732,9 @@ BasicParser.prototype = {
 
 				if (oToken.type === "(") { // args in parenthesis?
 					advance("(");
-					oValue.args = fnGetArgs(oValue.type); //until ")"
+					oValue.args = fnGetArgs(oValue.type); // until ")"
 					if (oToken.type !== ")") {
-						throw that.composeError(Error(), "Expected closing parenthesis for argument list after", oPreviousToken.value, oToken.pos); //TTT
+						throw that.composeError(Error(), "Expected closing parenthesis for argument list after", oPreviousToken.value, oToken.pos);
 					}
 					advance(")");
 				} else { // no parenthesis?
@@ -930,12 +930,12 @@ BasicParser.prototype = {
 		infix("+", 40);
 		infix("-", 40);
 
-		infixr("=", 30); // equal for comparison
-		infixr("<>", 30);
-		infixr("<", 30);
-		infixr("<=", 30);
-		infixr(">", 30);
-		infixr(">=", 30);
+		infix("=", 30); // equal for comparison, left associative
+		infix("<>", 30);
+		infix("<", 30);
+		infix("<=", 30);
+		infix(">", 30);
+		infix(">=", 30);
 
 		prefix("not", 23);
 		infixr("and", 22);

BasicTokenizer.js

@@ -22,13 +22,6 @@ BasicTokenizer.prototype = {
 		// empty
 	},
 
-	/*
-	reset: function () {
-		this.iPos = 0;
-		this.iLine = 0;
-	},
-	*/
-
 	decode: function (sProgram) { // decode tokenized BASIC to ASCII
 		// based on lbas2ascii.pl, 28.06.2006
 		var that = this,

Canvas.js

@@ -103,15 +103,13 @@ Canvas.prototype = {
 		this.fnUpdateCanvas2Handler = this.updateCanvas2.bind(this);
 
 		this.iFps = 15; // FPS for canvas update
-		//this.iTextFpsCounter = 0;
 
 		this.cpcAreaBox = document.getElementById("cpcAreaBox"); // TODO: move to view
 		this.textText = document.getElementById("textText"); // TODO: move to view
 
 		this.aCharset = this.options.aCharset;
 
 		this.iGColMode = 0; // 0=normal, 1=xor, 2=and, 3=or
-		//this.bClipped = false;
 
 		this.iMask = 255;
 		this.iMaskBit = 128;

CodeGeneratorJs.js

@@ -43,17 +43,8 @@ CodeGeneratorJs.prototype = {
 
 		this.iLine = 0; // current line (label)
 
-		/*
-		this.oStack = {
-			forLabel: [],
-			forVarName: [],
-			whileLabel: []
-		};
-		*/
-
 		this.resetCountsPerLine();
 
-		//this.aData = []; // collected data from data lines
 		this.aData.length = 0;
 
 		this.oLabels = {}; // labels or line numbers
@@ -496,13 +487,24 @@ CodeGeneratorJs.prototype = {
 					return node.pv;
 				},
 				hexnumber: function (node) {
-					var sValue = node.value.slice(1); // remove &
+					var sValue = node.value.slice(1), // remove &
+						n;
 
 					if (sValue.charAt(0).toLowerCase() === "h") { // optional h
 						sValue = sValue.slice(1); // remove
 					}
 
-					sValue = "0x" + ((sValue.length) ? sValue : "0"); // &->0x
+					sValue = sValue || "0";
+
+					n = parseInt(sValue, 16);
+
+					if (n > 32767) { //	two's complement
+						n = 65536 - n;
+						sValue = "-0x" + n.toString(16);
+					} else {
+						sValue = "0x" + sValue;
+					}
+
 					node.pt = "I";
 					node.pv = sValue;
 					return node.pv;
@@ -1236,7 +1238,7 @@ CodeGeneratorJs.prototype = {
 				},
 				run: function (node) { // optional arg can be number or string
 					if (node.args.length) {
-						if (node.args[0].type === "linenumber" || node.args[0].type === "number") { // optional line number //TTT should be linenumber only
+						if (node.args[0].type === "linenumber" || node.args[0].type === "number") { // optional line number (should be linenumber only)
 							this.fnAddReferenceLabel(fnParseOneArg(node.args[0]), node.args[0]); // parse only one arg, args are parsed later
 						}
 					}

CommonEventHandler.js

@@ -301,7 +301,7 @@ CommonEventHandler.prototype = {
 		sExample = this.view.getSelectValue("exampleSelect");
 		oExample = this.model.getExample(sExample);
 		oInFile.sCommand = "run";
-		if (oExample && oExample.meta) { // TTT TODO: this is just a workaround, meta is in input now; should change command after loading!
+		if (oExample && oExample.meta) { // TODO: this is just a workaround, meta is in input now; should change command after loading!
 			sType = oExample.meta.charAt(0);
 			if (sType === "B" || sType === "D" || sType === "G") { // binary, data only, Gena Assembler?
 				oInFile.sCommand = "load";

Controller.js

@@ -1354,7 +1354,7 @@ Controller.prototype = {
 			this.setInputText(sOutput, true);
 			this.fnPutChangedInputOnStack();
 
-			sDiff = Diff.testDiff(sInput.toUpperCase(), sOutput.toUpperCase()); //TTT: for testing
+			sDiff = Diff.testDiff(sInput.toUpperCase(), sOutput.toUpperCase()); // for testing
 			this.view.setAreaValue("outputText", sDiff);
 		}
 		if (sOutput && sOutput.length > 0) {
@@ -1593,7 +1593,7 @@ Controller.prototype = {
 	},
 
 	fnDirect: function () {
-		// TTT: break in direct mode?
+		// break in direct mode?
 	},
 
 	fnEnd: function () {
@@ -1613,7 +1613,7 @@ Controller.prototype = {
 		this.iNextLoopTimeOut = this.oVm.vmGetTimeUntilFrame(); // wait until next frame
 	},
 
-	fnOnError: function () { //TTT
+	fnOnError: function () {
 		this.oVm.vmStop("", 0, true); // continue
 	},
 
@@ -2062,7 +2062,7 @@ Controller.prototype = {
 		dropZone.addEventListener("dragover", this.fnHandleDragOver.bind(this), false);
 		dropZone.addEventListener("drop", this.fnHandleFileSelect.bind(this), false);
 
-		this.oCanvas.canvas.addEventListener("dragover", this.fnHandleDragOver.bind(this), false); //TTT fast hack
+		this.oCanvas.canvas.addEventListener("dragover", this.fnHandleDragOver.bind(this), false);
 		this.oCanvas.canvas.addEventListener("drop", this.fnHandleFileSelect.bind(this), false);
 
 		document.getElementById("fileInput").addEventListener("change", this.fnHandleFileSelect.bind(this), false);
@@ -2098,7 +2098,7 @@ Controller.prototype = {
 	},
 
 	// currently not used. Can be called manually: cpcBasic.controller.exportAsBase64(file);
-	exportAsBase64: function (sStorageName) { //TTT
+	exportAsBase64: function (sStorageName) {
 		var oStorage = Utils.localStorage,
 			sData = oStorage.getItem(sStorageName),
 			sOut = "",

CpcVm.js

@@ -1688,7 +1688,7 @@ CpcVm.prototype = {
 	inp: function (iPort) {
 		var byte;
 
-		iPort = this.vmRound2Complement(iPort, "INP"); // 2nd complement of 16 bit address
+		iPort = this.vmRound2Complement(iPort, "INP"); // two's complement of 16 bit address
 		// eslint-disable-next-line no-bitwise
 		byte = (iPort & 0xff);
 
@@ -1765,7 +1765,7 @@ CpcVm.prototype = {
 						aFileData.shift(); // remove line
 						sLine += "\n" + aFileData[0]; // combine lines
 					} else {
-						throw that.vmComposeError(Error(), 13, "INPUT #9: no closing quotes" + value); // TTT
+						throw that.vmComposeError(Error(), 13, "INPUT #9: no closing quotes" + value);
 					}
 				} else { // unquoted string
 					iIndex = sLine.indexOf(","); // multiple args?
@@ -1809,7 +1809,7 @@ CpcVm.prototype = {
 			sLine = sLine.replace(/^\s+/, ""); // remove preceding whitespace
 			if (sType === "$") {
 				value = fnGetString();
-			} else { // number type sLine.length TTT
+			} else { // number type sLine.length
 				value = fnGetNumber();
 			}
 
@@ -2264,7 +2264,7 @@ CpcVm.prototype = {
 		if (sInput !== null) {
 			sInput = sInput.replace(/\r\n/g, "\n"); // remove CR (maybe from ASCII file in "binary" form)
 			if (sInput.endsWith("\n")) {
-				sInput = sInput.substr(0, sInput.length - 1); // remove last "\n" (TTT: also for data files?)
+				sInput = sInput.substr(0, sInput.length - 1); // remove last "\n" (TODO: also for data files?)
 			}
 			oInFile.aFileData = sInput.split("\n");
 		} else {
@@ -3346,7 +3346,7 @@ CpcVm.prototype = {
 		this.oCanvas.resetCustomChars();
 		if (iChar === 256) { // maybe move up again
 			iMinCharHimem = this.iMaxHimem;
-			this.iMaxCharHimem = iMinCharHimem; //TTT corrected
+			this.iMaxCharHimem = iMinCharHimem;
 		}
 		// TODO: Copy char data to screen memory, if screen starts at 0x4000 and chardata is in that range (and ram 0 is selected)
 		this.iMinCustomChar = iChar;
@@ -3512,9 +3512,15 @@ CpcVm.prototype = {
 		} else if (s.startsWith("&h")) { // hex &h
 			s = s.slice(2);
 			iNum = parseInt(s, 16);
+			if (iNum > 32767) { // two's complement
+				iNum -= 65536;
+			}
 		} else if (s.startsWith("&")) { // hex &
 			s = s.slice(1);
 			iNum = parseInt(s, 16);
+			if (iNum > 32767) { // two's complement
+				iNum -= 65536;
+			}
 		} else if (s !== "") { // not empty string?
 			iNum = parseFloat(s);
 		}

DiskImage.js

@@ -94,7 +94,6 @@ DiskImage.prototype = {
 		oDiskInfo.sIdent = sIdent + this.readUtf(iPos + 8, 34 - 8); // read remaining ident
 
 		if (oDiskInfo.sIdent.substr(34 - 11, 9) !== "Disk-Info") { // some tools use "Disk-Info  " instead of "Disk-Info\r\n", so compare without "\r\n"
-			//throw this.composeError(Error(), "Disk ident not found", oDiskInfo.sIdent.substr(34 - 11, 9), iPos);
 			// "Disk-Info" string is optional
 			Utils.console.warn(this.composeError({}, "Disk ident not found", oDiskInfo.sIdent.substr(34 - 11, 9), iPos + 34 - 11).message);
 		}
@@ -130,7 +129,6 @@ DiskImage.prototype = {
 
 		oTrackInfo.sIdent = this.readUtf(iPos, 12);
 		if (oTrackInfo.sIdent.substr(0, 10) !== "Track-Info") { // some tools use ""Track-Info  " instead of ""Track-Info\r\n", so compare without "\r\n"
-			//throw this.composeError(Error(), "Track ident not found", oTrackInfo.sIdent.substr(0, 10), iPos);
 			// "Track-Info" string is optional
 			Utils.console.warn(this.composeError({}, "Track ident not found", oTrackInfo.sIdent.substr(0, 10), iPos).message);
 		}
@@ -324,7 +322,7 @@ DiskImage.prototype = {
 			sFormat = "data";
 		} else if (iFirstSector === 0x41) {
 			sFormat = "system";
-		} else if ((iFirstSector === 0x01) && (oDiskInfo.iTracks === 80)) { // big780k TTT
+		} else if ((iFirstSector === 0x01) && (oDiskInfo.iTracks === 80)) { // big780k
 			sFormat = "big780k";
 		} else {
 			throw this.composeError(Error(), "Unknown format with sector", String(iFirstSector));

Keyboard.js

@@ -204,7 +204,6 @@ Keyboard.prototype = {
 		this.aExpansionTokens = []; // expansion tokens 0..31 (in reality: 128..159)
 		this.oCpcKeyExpansions = {}; // cpc keys to expansion tokens for normal, shift, ctrl; also repeat
 
-		//this.reset();
 		this.bActive = false; // flag if keyboard is active/focused, set from outside
 
 		this.bCodeStringsRemoved = false;