Fix rewind bug

graham-trott · graham-trott · commit 6ecc867ac1b1 · 2022-11-17T23:24:33.000Z
diff --git a/dist/easycoder-min.js b/dist/easycoder-min.js
diff --git a/dist/easycoder.js b/dist/easycoder.js
@@ -1509,11 +1509,11 @@ const EasyCoder_Core = {
 					}
 					const value = [];
 					while (true) {
-						compiler.mark();
+						const mark = compiler.getIndex();
 						try {
 							value.push(compiler.getValue());
 						} catch (err) {
-							compiler.rewind();
+							compiler.rewindTo(mark);
 							break;
 						}
 					}
@@ -7617,15 +7617,15 @@ const EasyCoder_Condition = {
 
 	compile: (compiler) => {
 		// See if any of the domains can handle it
-		compiler.mark();
+		const mark = compiler.getIndex();
 		for (const domainName of Object.keys(compiler.domain)) {
 			// console.log(`Try domain '${domainName}' for condition`);
 			const domain = compiler.domain[domainName];
 			const code = domain.condition.compile(compiler);
 			if (code) {
 				return code;
 			}
-			compiler.rewind();
+			compiler.rewindto(mark);
 		}
 	},
 
@@ -7691,14 +7691,14 @@ const EasyCoder_Value = {
 		}
 
 		// See if any of the domains can handle it
-		compiler.mark();
+		const mark = compiler.getIndex();
 		for (const name of Object.keys(compiler.domain)) {
 			const handler = compiler.domain[name];
 			const code = handler.value.compile(compiler);
 			if (code) {
 				return code;
 			}
-			compiler.rewind();
+			compiler.rewindTo(mark);
 		}
 		return null;
 	},
@@ -8210,6 +8210,10 @@ const EasyCoder_Compiler = {
 		this.index = this.savedMark;
 	},
 
+	rewindTo: function(index) {
+		this.index = index;
+	},
+
 	completeHandler: function() {
 		const lino = this.getLino();
 		// Add a 'goto' to skip the action
@@ -8284,7 +8288,7 @@ const EasyCoder_Compiler = {
 			return;
 		}
 		// console.log(`Compile ${token}`);
-		this.mark();
+		const mark = compiler.getIndex();
 		for (const domainName of Object.keys(this.domain)) {
 			// console.log(`Try domain ${domainName} for token ${token}`);
 			const domain = this.domain[domainName];
@@ -8296,7 +8300,7 @@ const EasyCoder_Compiler = {
 					}
 				}
 			}
-			this.rewind();
+			this.rewindTo(mark);
 		}
 		console.log(`No handler found`);
 		throw new Error(`I don't understand '${token}...'`);
diff --git a/js/easycoder/Compile.js b/js/easycoder/Compile.js
@@ -175,6 +175,10 @@ const EasyCoder_Compiler = {
 		this.index = this.savedMark;
 	},
 
+	rewindTo: function(index) {
+		this.index = index;
+	},
+
 	completeHandler: function() {
 		const lino = this.getLino();
 		// Add a 'goto' to skip the action
@@ -249,7 +253,7 @@ const EasyCoder_Compiler = {
 			return;
 		}
 		// console.log(`Compile ${token}`);
-		this.mark();
+		const mark = compiler.getIndex();
 		for (const domainName of Object.keys(this.domain)) {
 			// console.log(`Try domain ${domainName} for token ${token}`);
 			const domain = this.domain[domainName];
@@ -261,7 +265,7 @@ const EasyCoder_Compiler = {
 					}
 				}
 			}
-			this.rewind();
+			this.rewindTo(mark);
 		}
 		console.log(`No handler found`);
 		throw new Error(`I don't understand '${token}...'`);
diff --git a/js/easycoder/Condition.js b/js/easycoder/Condition.js
@@ -5,15 +5,15 @@ const EasyCoder_Condition = {
 
 	compile: (compiler) => {
 		// See if any of the domains can handle it
-		compiler.mark();
+		const mark = compiler.getIndex();
 		for (const domainName of Object.keys(compiler.domain)) {
 			// console.log(`Try domain '${domainName}' for condition`);
 			const domain = compiler.domain[domainName];
 			const code = domain.condition.compile(compiler);
 			if (code) {
 				return code;
 			}
-			compiler.rewind();
+			compiler.rewindto(mark);
 		}
 	},
 
diff --git a/js/easycoder/Core.js b/js/easycoder/Core.js
@@ -1509,11 +1509,11 @@ const EasyCoder_Core = {
 					}
 					const value = [];
 					while (true) {
-						compiler.mark();
+						const mark = compiler.getIndex();
 						try {
 							value.push(compiler.getValue());
 						} catch (err) {
-							compiler.rewind();
+							compiler.rewindTo(mark);
 							break;
 						}
 					}
diff --git a/js/easycoder/Value.js b/js/easycoder/Value.js
@@ -53,14 +53,14 @@ const EasyCoder_Value = {
 		}
 
 		// See if any of the domains can handle it
-		compiler.mark();
+		const mark = compiler.getIndex();
 		for (const name of Object.keys(compiler.domain)) {
 			const handler = compiler.domain[name];
 			const code = handler.value.compile(compiler);
 			if (code) {
 				return code;
 			}
-			compiler.rewind();
+			compiler.rewindTo(mark);
 		}
 		return null;
 	},

Original file line number	Diff line number	Diff line change
`@@ -1509,11 +1509,11 @@ const EasyCoder_Core = {`
`1509`	`1509`	`}`
`1510`	`1510`	`const value = [];`
`1511`	`1511`	`while (true) {`
`1512`		`- compiler.mark();`
	`1512`	`+ const mark = compiler.getIndex();`
`1513`	`1513`	`try {`
`1514`	`1514`	`value.push(compiler.getValue());`
`1515`	`1515`	`} catch (err) {`
`1516`		`- compiler.rewind();`
	`1516`	`+ compiler.rewindTo(mark);`
`1517`	`1517`	`break;`
`1518`	`1518`	`}`
`1519`	`1519`	`}`
`@@ -7617,15 +7617,15 @@ const EasyCoder_Condition = {`
`7617`	`7617`
`7618`	`7618`	`compile: (compiler) => {`
`7619`	`7619`	`// See if any of the domains can handle it`
`7620`		`- compiler.mark();`
	`7620`	`+ const mark = compiler.getIndex();`
`7621`	`7621`	`for (const domainName of Object.keys(compiler.domain)) {`
`7622`	`7622`	// console.log(`Try domain '${domainName}' for condition`);
`7623`	`7623`	`const domain = compiler.domain[domainName];`
`7624`	`7624`	`const code = domain.condition.compile(compiler);`
`7625`	`7625`	`if (code) {`
`7626`	`7626`	`return code;`
`7627`	`7627`	`}`
`7628`		`- compiler.rewind();`
	`7628`	`+ compiler.rewindto(mark);`
`7629`	`7629`	`}`
`7630`	`7630`	`},`
`7631`	`7631`
`@@ -7691,14 +7691,14 @@ const EasyCoder_Value = {`
`7691`	`7691`	`}`
`7692`	`7692`
`7693`	`7693`	`// See if any of the domains can handle it`
`7694`		`- compiler.mark();`
	`7694`	`+ const mark = compiler.getIndex();`
`7695`	`7695`	`for (const name of Object.keys(compiler.domain)) {`
`7696`	`7696`	`const handler = compiler.domain[name];`
`7697`	`7697`	`const code = handler.value.compile(compiler);`
`7698`	`7698`	`if (code) {`
`7699`	`7699`	`return code;`
`7700`	`7700`	`}`
`7701`		`- compiler.rewind();`
	`7701`	`+ compiler.rewindTo(mark);`
`7702`	`7702`	`}`
`7703`	`7703`	`return null;`
`7704`	`7704`	`},`
`@@ -8210,6 +8210,10 @@ const EasyCoder_Compiler = {`
`8210`	`8210`	`this.index = this.savedMark;`
`8211`	`8211`	`},`
`8212`	`8212`
	`8213`	`+ rewindTo: function(index) {`
	`8214`	`+ this.index = index;`
	`8215`	`+ },`
	`8216`	`+`
`8213`	`8217`	`completeHandler: function() {`
`8214`	`8218`	`const lino = this.getLino();`
`8215`	`8219`	`// Add a 'goto' to skip the action`
`@@ -8284,7 +8288,7 @@ const EasyCoder_Compiler = {`
`8284`	`8288`	`return;`
`8285`	`8289`	`}`
`8286`	`8290`	// console.log(`Compile ${token}`);
`8287`		`- this.mark();`
	`8291`	`+ const mark = compiler.getIndex();`
`8288`	`8292`	`for (const domainName of Object.keys(this.domain)) {`
`8289`	`8293`	// console.log(`Try domain ${domainName} for token ${token}`);
`8290`	`8294`	`const domain = this.domain[domainName];`
`@@ -8296,7 +8300,7 @@ const EasyCoder_Compiler = {`
`8296`	`8300`	`}`
`8297`	`8301`	`}`
`8298`	`8302`	`}`
`8299`		`- this.rewind();`
	`8303`	`+ this.rewindTo(mark);`
`8300`	`8304`	`}`
`8301`	`8305`	console.log(`No handler found`);
`8302`	`8306`	throw new Error(`I don't understand '${token}...'`);
Original file line number	Diff line number	Diff line change
`@@ -175,6 +175,10 @@ const EasyCoder_Compiler = {`
`175`	`175`	`this.index = this.savedMark;`
`176`	`176`	`},`
`177`	`177`
	`178`	`+ rewindTo: function(index) {`
	`179`	`+ this.index = index;`
	`180`	`+ },`
	`181`	`+`
`178`	`182`	`completeHandler: function() {`
`179`	`183`	`const lino = this.getLino();`
`180`	`184`	`// Add a 'goto' to skip the action`
`@@ -249,7 +253,7 @@ const EasyCoder_Compiler = {`
`249`	`253`	`return;`
`250`	`254`	`}`
`251`	`255`	// console.log(`Compile ${token}`);
`252`		`- this.mark();`
	`256`	`+ const mark = compiler.getIndex();`
`253`	`257`	`for (const domainName of Object.keys(this.domain)) {`
`254`	`258`	// console.log(`Try domain ${domainName} for token ${token}`);
`255`	`259`	`const domain = this.domain[domainName];`
`@@ -261,7 +265,7 @@ const EasyCoder_Compiler = {`
`261`	`265`	`}`
`262`	`266`	`}`
`263`	`267`	`}`
`264`		`- this.rewind();`
	`268`	`+ this.rewindTo(mark);`
`265`	`269`	`}`
`266`	`270`	console.log(`No handler found`);
`267`	`271`	throw new Error(`I don't understand '${token}...'`);
Original file line number	Diff line number	Diff line change
`@@ -53,14 +53,14 @@ const EasyCoder_Value = {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`// See if any of the domains can handle it`
`56`		`- compiler.mark();`
	`56`	`+ const mark = compiler.getIndex();`
`57`	`57`	`for (const name of Object.keys(compiler.domain)) {`
`58`	`58`	`const handler = compiler.domain[name];`
`59`	`59`	`const code = handler.value.compile(compiler);`
`60`	`60`	`if (code) {`
`61`	`61`	`return code;`
`62`	`62`	`}`
`63`		`- compiler.rewind();`
	`63`	`+ compiler.rewindTo(mark);`
`64`	`64`	`}`
`65`	`65`	`return null;`
`66`	`66`	`},`