add missing line numbers on load

benchmarko · benchmarko · commit 30ca9c6e6207 · 2025-03-15T17:09:21.000+01:00
diff --git a/Controller.js b/Controller.js
@@ -175,6 +175,23 @@ Controller.prototype = {
 		}
 	},
 
+	addLineNumbers: function (input) {
+		var lineParts, lastLine, lineNum, i;
+		lineParts = input.split("\n");
+		lastLine = 0;
+
+		for (i = 0; i < lineParts.length; i += 1) {
+			lineNum = parseInt(lineParts[i], 10);
+
+			if (isNaN(lineNum)) {
+				lineNum = lastLine + 1;
+				lineParts[i] = String(lastLine + 1) + " " + lineParts[i];
+			}
+			lastLine = lineNum;
+		}
+		return lineParts.join("\n");
+	},
+
 	// Also called from example files xxxxx.js
 	addItem: function (sKey, sInput) { // optional sKey
 		var oExample;
@@ -186,6 +203,10 @@ Controller.prototype = {
 
 		sInput = sInput.replace(/^\n/, "").replace(/\n$/, ""); // remove preceding and trailing newlines
 		// beware of data files ending with newlines! (do not use trimEnd)
+	
+		if (sInput.startsWith("REM ")) {
+			sInput = this.addLineNumbers(sInput);
+		}
 
 		oExample = this.model.getExample(sKey);
 		oExample.key = sKey; // maybe changed
diff --git a/examples/0index.js b/examples/0index.js
@@ -21,6 +21,10 @@ cpcBasic.addIndex("./examples", {
 			"key": "test/testpage.dat",
 			"title": "Test data for Test Page",
 			"meta": "D"
+		},
+		{
+			"key": "test/testsub",
+			"title": "Test Subroutines"
 		}
 	]
 });
diff --git a/examples/test/testsub.js b/examples/test/testsub.js
@@ -0,0 +1,37 @@
+/* globals cpcBasic */
+
+"use strict";
+
+cpcBasic.addItem("", function () { /*
+REM testsub - Test Subroutines TS
+REM only required line numbers; no GOTO
+CLS
+PRINT "start"
+GOSUB 350
+PRINT "end"
+END
+'
+100 PRINT "sub100"
+RETURN
+'
+200 PRINT "sub200"
+  PRINT "inside sub200"
+  GOSUB 100
+RETURN
+'
+GOSUB 200
+PRINT "in between"
+'
+300 PRINT "sub300"
+  PRINT "inside sub300"
+RETURN
+'
+350 'main
+GOSUB 100
+GOSUB 200
+GOSUB 300
+a=1
+ON a GOSUB 200, 300
+RETURN
+'
+*/ });
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.17</title>
+<title id="title">CPC Basic v0.10.18</title>
 </head>
 
 <body id="pageBody">
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cpcbasic",
-  "version": "0.10.17",
+  "version": "0.10.18",
   "description": "# CPCBasic - Run CPC BASIC in a Browser",
   "main": "cpcbasic.js",
   "directories": {
diff --git a/test/testParseExamples.qunit.js b/test/testParseExamples.qunit.js
@@ -169,6 +169,23 @@ cpcBasic = {
 		}
 	},
 
+	addLineNumbers: function (input) {
+		var lineParts, lastLine, lineNum, i;
+		lineParts = input.split("\n");
+		lastLine = 0;
+
+		for (i = 0; i < lineParts.length; i += 1) {
+			lineNum = parseInt(lineParts[i], 10);
+
+			if (isNaN(lineNum)) {
+				lineNum = lastLine + 1;
+				lineParts[i] = String(lastLine + 1) + " " + lineParts[i];
+			}
+			lastLine = lineNum;
+		}
+		return lineParts.join("\n");
+	},
+
 	// Also called from example files xxxxx.js
 	addItem2: function (sKey, sInput) { // optional sKey
 		var oExample;
@@ -180,6 +197,10 @@ cpcBasic = {
 		sInput = sInput.replace(/^\n/, "").replace(/\n$/, ""); // remove preceding and trailing newlines
 		// beware of data files ending with newlines! (do not use trimEnd)
 
+		if (sInput.startsWith("REM ")) {
+			sInput = this.addLineNumbers(sInput);
+		}
+
 		oExample = this.model.getExample(sKey);
 		oExample.key = sKey; // maybe changed
 		oExample.script = sInput;

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,10 @@ cpcBasic.addIndex("./examples", {`
`21`	`21`	`"key": "test/testpage.dat",`
`22`	`22`	`"title": "Test data for Test Page",`
`23`	`23`	`"meta": "D"`
	`24`	`+ },`
	`25`	`+ {`
	`26`	`+ "key": "test/testsub",`
	`27`	`+ "title": "Test Subroutines"`
`24`	`28`	`}`
`25`	`29`	`]`
`26`	`30`	`});`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "cpcbasic",`
`3`		`- "version": "0.10.17",`
	`3`	`+ "version": "0.10.18",`
`4`	`4`	`"description": "# CPCBasic - Run CPC BASIC in a Browser",`
`5`	`5`	`"main": "cpcbasic.js",`
`6`	`6`	`"directories": {`