MIN,MAX: allow string as only argument; allow lines and direct commands in multi-line input; examples moved to CPCBasicApps

Author: benchmarko

CodeGeneratorJs.js

@@ -1317,12 +1317,22 @@ CodeGeneratorJs.prototype = {
 
 				if (fnIsInString(" asc cint derr eof erl err fix fre inkey inp instr int joy len memory peek pos remain sgn sq test testr unt vpos xpos ypos ", sTypeWithSpaces)) {
 					node.pt = "I";
-				} else if (fnIsInString(" abs atn cos creal exp log log10 max min pi rnd round sin sqr tan time val ", sTypeWithSpaces)) {
+				} else if (fnIsInString(" abs atn cos creal exp log log10 pi rnd round sin sqr tan time val ", sTypeWithSpaces)) {
 					node.pt = "R";
 				} else if (fnIsInString(" bin$ chr$ copychr$ dec$ hex$ inkey$ left$ lower$ mid$ right$ space$ str$ string$ upper$ ", sTypeWithSpaces)) {
 					node.pt = "$";
 				}
 
+				// Note: min and max usually return a number, but for a single string argument also the string!
+				if (node.type === "min" || node.type === "max") {
+					if (node.args.length === 1) {
+						if (node.args[0].type === "$") {
+							node.pt = "$";
+						}
+					} else if (node.args.length > 1) {
+						node.pt = "R";
+					}
+				}
 				return node.pv;
 			},
 
@@ -1467,7 +1477,9 @@ CodeGeneratorJs.prototype = {
 		} catch (e) {
 			oOut.error = e;
 			if ("pos" in e) {
-				Utils.console.warn(e); // our errors have "pos" defined => show as warning
+				if (!this.bQuiet) {
+					Utils.console.warn(e); // our errors have "pos" defined => show as warning
+				}
 			} else { // other errors
 				Utils.console.error(e);
 			}

Controller.js

@@ -446,7 +446,7 @@ Controller.prototype = {
 			switch (sKey) {
 			case "": // no key?
 				break;
-			case "\r": // cr (\x0c)
+			case "\r": // cr (\x0d)
 				break;
 			case "\x10": // DLE (clear character under cursor)
 				sKey = "\x07"; // currently ignore (BEL)
@@ -1381,7 +1381,10 @@ Controller.prototype = {
 	fnRun: function (oParas) {
 		var sScript = this.view.getAreaValue("outputText"),
 			iLine = oParas && oParas.iLine || 0,
-			oVm = this.oVm;
+			oVm = this.oVm,
+			that = this,
+			iTimeout = 1,
+			input;
 
 		iLine = iLine || 0;
 		if (iLine === 0) {
@@ -1409,10 +1412,12 @@ Controller.prototype = {
 			oVm.clear(); // we do a clear as well here
 		}
 		oVm.vmReset4Run();
+		/*
 		if (!this.bInputSet) {
 			this.bInputSet = true;
 			this.oKeyboard.putKeysInBuffer(this.model.getProperty("input"));
 		}
+		*/
 
 		if (this.fnScript) {
 			oVm.sOut = this.view.getAreaValue("resultText");
@@ -1424,6 +1429,19 @@ Controller.prototype = {
 			this.view.setDisabled("stopButton", false);
 			this.view.setDisabled("continueButton", true);
 		}
+
+		if (!this.bInputSet) {
+			this.bInputSet = true;
+			input = this.model.getProperty("input");
+
+			if (input !== "") {
+				this.view.setAreaValue("inp2Text", input);
+				setTimeout(function () {
+					that.startEnter();
+				}, iTimeout);
+			}
+		}
+
 		if (Utils.debug > 1) {
 			Utils.console.debug("End of fnRun");
 		}
@@ -1762,7 +1780,7 @@ Controller.prototype = {
 		var sInput = this.view.getAreaValue("inp2Text"),
 			i;
 
-		sInput = sInput.replace("\n", "\r"); // LF => CR
+		sInput = sInput.replace(/\n/g, "\r"); // LF => CR
 		if (!sInput.endsWith("\r")) {
 			sInput += "\r";
 		}

CpcVm.js

@@ -626,7 +626,7 @@ CpcVm.prototype = {
 		if (iTime >= this.iNextFrameTime) {
 			this.vmCheckNextFrame(iTime);
 			this.iStopCount += 1;
-			if (this.iStopCount >= 5) { // do not stop too often because of just timer resason because setTimeout is expensive
+			if (this.iStopCount >= 5) { // do not stop too often because of just timer reason because setTimeout is expensive
 				this.iStopCount = 0;
 				this.vmStop("timer", 20);
 			}
@@ -2091,6 +2091,13 @@ CpcVm.prototype = {
 	max: function () { // varargs
 		var i;
 
+		if (arguments.length === 1) { // if just one argument, return it, even if it is a string
+			if (typeof arguments[0] !== "number" && !this.quiet) {
+				Utils.console.warn("MAX: Not a number:", arguments[0]);
+			}
+			return arguments[0];
+		}
+
 		for (i = 0; i < arguments.length; i += 1) {
 			this.vmAssertNumber(arguments[i], "MAX");
 		}
@@ -2145,6 +2152,13 @@ CpcVm.prototype = {
 	min: function () { // varargs
 		var i;
 
+		if (arguments.length === 1) { // if just one argument, return it, even if it is a string
+			if (typeof arguments[0] !== "number" && !this.quiet) {
+				Utils.console.warn("MIN: Not a number:", arguments[0]);
+			}
+			return arguments[0];
+		}
+
 		for (i = 0; i < arguments.length; i += 1) {
 			this.vmAssertNumber(arguments[i], "MIN");
 		}

DiskImage.js

@@ -23,6 +23,7 @@ DiskImage.prototype = {
 		this.oConfig = oConfig || {};
 
 		this.sData = oConfig.sData;
+		this.bQuiet = oConfig.bQuiet || false;
 		this.reset();
 	},
 
@@ -95,7 +96,9 @@ DiskImage.prototype = {
 
 		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"
 			// "Disk-Info" string is optional
-			Utils.console.warn(this.composeError({}, "Disk ident not found", oDiskInfo.sIdent.substr(34 - 11, 9), iPos + 34 - 11).message);
+			if (!this.bQuiet) {
+				Utils.console.warn(this.composeError({}, "Disk ident not found", oDiskInfo.sIdent.substr(34 - 11, 9), iPos + 34 - 11).message);
+			}
 		}
 
 		oDiskInfo.sCreator = this.readUtf(iPos + 34, 14);
@@ -130,7 +133,9 @@ 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"
 			// "Track-Info" string is optional
-			Utils.console.warn(this.composeError({}, "Track ident not found", oTrackInfo.sIdent.substr(0, 10), iPos).message);
+			if (!this.bQuiet) {
+				Utils.console.warn(this.composeError({}, "Track ident not found", oTrackInfo.sIdent.substr(0, 10), iPos).message);
+			}
 		}
 		// 4 unused bytes
 		oTrackInfo.iTrack = this.readUInt8(iPos + 16);

README.md

@@ -5,13 +5,13 @@ BASIC programs are compiled to JavaScript which can be run in the browser. A lib
 
 CPCBasic Links:
 [CPCBasic Demo](https://benchmarko.github.io/CPCBasic/index.html?example=cpcbasic),
-[Colors CPC Demo](https://benchmarko.github.io/CPCBasic/index.html?example=demo/colors),
+[Colors CPC Demo](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=test/colors),
 [Source code](https://github.com/benchmarko/CPCBasic/),
 [HTML Readme](https://github.com/benchmarko/CPCBasic/#readme),
 
 Please note:
 CpcBasic gets only bug fixes. Active development goes on with CpcBasicTS, the TypeScript implementation of CPCBasic:
-[CPCBasicTS Demo](https://benchmarko.github.io/CPCBasicTS/?example=cpcbasic),
+[CPCBasicTS Demo](https://benchmarko.github.io/CPCBasicTS/),
 [CPCBasicTS Source](https://github.com/benchmarko/CPCBasicTS/)
 
 ## Features
@@ -26,12 +26,12 @@ CpcBasic gets only bug fixes. Active development goes on with CpcBasicTS, the Ty
 
 [![A sample with cpcbasic](./img/cpcbasic.gif)](https://benchmarko.github.io/CPCBasic/index.html?example=cpcbasic)
 
-[![Art](./img/art.png)](https://benchmarko.github.io/CPCBasic/index.html?example=art)
-[![Graphics](./img/graphics.png)](https://benchmarko.github.io/CPCBasic/index.html?example=demo/graphics)
-[![Labyrinth](./img/labyrinth.png)](https://benchmarko.github.io/CPCBasic/index.html?example=labyrinth)
-[![Landscape](./img/landscape.png)](https://benchmarko.github.io/CPCBasic/index.html?example=landscape)
+[![Art](./img/art.png)](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=test/art)
+[![Graphics](./img/graphics.png)](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=test/graphics)
+[![Labyrinth](./img/labyrinth.png)](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=test/labyrinth)
+[![Landscape](./img/landscape.png)](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=test/landscape)
 
-More examples are in the sample library [CPCBasicApps](https://github.com/benchmarko/CPCBasicApps/#readme). They are included in CPCBasic as *apps*, example: [10print](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=demo/10print).
+More examples are in the sample library [CPCBasicApps](https://benchmarko.github.io/CPCBasicApps/), [CPCBasicApps source](https://github.com/benchmarko/CPCBasicApps/#readme). They are included in CPCBasic as *apps*, example: [10print](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=demo/10print).
 
 ## Why CPCBasic
 
@@ -63,7 +63,7 @@ With CPC Basic we do not get that accuracy. But if we compile it to JavaScript,
   - The **Sound** button activates or deactivates sound.
     - If you use the *Reload* button with sound activated, the sound needs to be activated again. Just do a user action, e.g. click somewhere. This is a browser limitation.
 - The *Text View* window shows the text which is written in text mode.
-- The *Keyboard* window shows a virtual keyboard which can be also used with touch devices. You can test the functionality with the test program [keyboard](https://benchmarko.github.io/CPCBasic/index.html?example=test/keyboard&showKbd=true).
+- The *Keyboard* window shows a virtual keyboard which can be also used with touch devices. You can test the functionality with the test program [keyboard](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=test/keyboard&showKbd=true).
 - The *Input* window is an alternative way to send input to the CPC.
 - The *Console* window shows the textual output. This is useful for copying and pasting the output. It is cleared when the CPC screen is cleared (*MODE* or *CLS*).
 - The *Variables* window allows you to see the variables used by the program.
@@ -99,10 +99,10 @@ With CPC Basic we do not get that accuracy. But if we compile it to JavaScript,
   The next *INKEY$* will return it. This could be useful to select options presented on the screen.
   Another feature: After a MOVE 1000,1000, a mouse click does a *MOVE* at the click position.
   This can be detected by a BASIC program.
-  Example: [Mouse Painting](https://benchmarko.github.io/CPCBasic/index.html?example=test/mousepa)
+  Example: [Mouse Painting](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=test/mousepa)
 - *MODE 3*: High resolution mode with real 640x400 pixels, 16 colors and 8x8 pixels per character.
   This is different to the unofficial and not very useful Gate Array mode 3 on a real CPC: [CPC live: Graphics](http://cpctech.cpc-live.com/docs/graphics.html).
-Several examples use CPCBasic mode 3, e.g. [Art](https://benchmarko.github.io/CPCBasic/index.html?example=art), [Landscape](https://benchmarko.github.io/CPCBasic/index.html?example=landscape), [Rectangles](https://benchmarko.github.io/CPCBasic/index.html?example=test/rectangles).
+Several examples use CPCBasic mode 3, e.g. [Art](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=test/art), [Landscape](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=test/landscape), [Rectangles](https://benchmarko.github.io/CPCBasic/index.html?database=apps&example=test/rectangles).
 - *|MODE,n*: Change mode without *CLS*, including mode 3 (experimental)
 - *|RENUM,...*: similar to *RENUM* but with a 4th parameter to keep line numbers starting with this line
 - Computations with numbers are not limited to 16 bit