Skip to content

Slight jsexecute.js improvements #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zanxz-lol wants to merge 3 commits into
base: develop
Choose a base branch
from
+18 −19
Open

Slight jsexecute.js improvements #323

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b34f361
Made listIndex and listIndexSlow faster
zanxz-lol Dec 21, 2025
022e10e
Made listContains faster by removing indexOf()
zanxz-lol Dec 21, 2025
40b5eab
Reverted changes to listContains()
zanxz-lol Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 18 additions & 19 deletions src/compiler/jsexecute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ runtimeFunctions.compareLessThan = `const compareLessThanSlow = (v1, v2) => {
}
return n1 < n2;
};
const compareLessThan = (v1, v2) => typeof v1 === 'number' && typeof v2 === 'number' && !Number.isNaN(v2) ? v1 < v2 : compareLessThanSlow(v1, v2)`;
const compareLessThan = (v1, v2) => typeof v1 === 'number' && typeof v2 === 'number' && !Number.isNaN(v2) ? v1 < v2 : compareLessThanSlow(v1, v2);`;

/**
* Generate a random integer.
Expand Down Expand Up @@ -411,26 +411,25 @@ runtimeFunctions.distance = `const distance = menu => {
* @returns {number} 0 based list index, or -1 if invalid.
*/
baseRuntime += `const listIndexSlow = (index, length) => {
if (index === 'last') {
return length - 1;
} else if (index === 'random' || index === 'any') {
if (length > 0) {
return (Math.random() * length) | 0;
}
return -1;
}
index = (+index || 0) | 0;
if (index < 1 || index > length) {
return -1;
}
return index - 1;
switch(index) {
case 'last':
return length - 1;
case 'any':
case 'random':
return (length > 0) ? ((Math.random() * length) | 0) : -1;
default:
index = (+index || 0) | 0;
return (index < 1 || index > length) ? -1: index - 1;
}
};

const listIndex = (index, length) => {
if (typeof index !== 'number') {
return listIndexSlow(index, length);
/* expect a number instead since barely anyone uses a string */
if (typeof index === 'number') {
index = index | 0;
return index < 1 || index > length ? -1 : index - 1;
}
index = index | 0;
return index < 1 || index > length ? -1 : index - 1;
return listIndexSlow(index, length);
};`;

/**
Expand Down Expand Up @@ -502,10 +501,10 @@ runtimeFunctions.listDelete = `const listDelete = (list, idx) => {
* @returns {boolean} True if the list contains the item
*/
runtimeFunctions.listContains = `const listContains = (list, item) => {
// TODO: evaluate whether indexOf is worthwhile here
if (list.value.indexOf(item) !== -1) {
return true;
}
/* i stand corrected */
for (let i = 0; i < list.value.length; i++) {
if (compareEqual(list.value[i], item)) {
return true;
Expand Down