topchetoeu/j2s
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 74 Wiki Activity

refactor: some spring cleaning in array lib, fix small issue with join

Browse Source
This commit is contained in:
TopchetoEU 2024-01-06 17:44:23 +02:00
parent 5f4011aa0c
commit 07a6f18b16
Signed by: topchetoeu
GPG Key ID: 6531B8583E5F6ED4
1 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/me/topchetoeu/jscript/lib/ArrayLib.java
View File

@ -21,7 +21,7 @@ public class ArrayLib {
if (i < 0) i += len; if (i < 0) i += len;
if (clamp) { if (clamp) {
if (i < 0) i = 0; if (i < 0) i = 0;
if (i >= len) i = len; if (i > len) i = len;
} }
return i; return i;
} }
@ -133,46 +133,48 @@ public class ArrayLib {
} }
@Expose public static boolean __every(Arguments args) { @Expose public static boolean __every(Arguments args) {
var arr = args.self(ArrayValue.class); var arr = args.self(ArrayValue.class);
var func = args.convert(0, FunctionValue.class);
var thisArg = args.get(1);
for (var i = 0; i < arr.size(); i++) { for (var i = 0; i < arr.size(); i++) {
if (!Values.toBoolean(func.call(args.ctx, thisArg, arr.get(i), i, arr))) return false; if (arr.has(i) && !Values.toBoolean(Values.call(
args.ctx, args.get(0), args.get(1),
arr.get(i), i, arr
))) return false;
} }
return true; return true;
} }
@Expose public static boolean __some(Arguments args) { @Expose public static boolean __some(Arguments args) {
var arr = args.self(ArrayValue.class); var arr = args.self(ArrayValue.class);
var func = args.convert(0, FunctionValue.class);
var thisArg = args.get(1);
for (var i = 0; i < arr.size(); i++) { for (var i = 0; i < arr.size(); i++) {
if (Values.toBoolean(func.call(args.ctx, thisArg, arr.get(i), i, arr))) return true; if (arr.has(i) && Values.toBoolean(Values.call(
args.ctx, args.get(0), args.get(1),
arr.get(i), i, arr
))) return true;
} }
return false; return false;
} }
@Expose public static ArrayValue __filter(Arguments args) { @Expose public static ArrayValue __filter(Arguments args) {
var arr = args.self(ArrayValue.class); var arr = args.self(ArrayValue.class);
var func = args.convert(0, FunctionValue.class);
var thisArg = args.get(1);
var res = new ArrayValue(arr.size()); var res = new ArrayValue(arr.size());
for (int i = 0, j = 0; i < arr.size(); i++) { for (int i = 0, j = 0; i < arr.size(); i++) {
if (arr.has(i) && Values.toBoolean(func.call(args.ctx, thisArg, arr.get(i), i, arr))) res.set(args.ctx, j++, arr.get(i)); if (arr.has(i) && Values.toBoolean(Values.call(
args.ctx, args.get(0), args.get(1),
arr.get(i), i, arr
))) res.set(args.ctx, j++, arr.get(i));
} }
return res; return res;
} }
@Expose public static ArrayValue __map(Arguments args) { @Expose public static ArrayValue __map(Arguments args) {
var arr = args.self(ArrayValue.class); var arr = args.self(ArrayValue.class);
var func = args.convert(0, FunctionValue.class);
var thisArg = args.get(1);
var res = new ArrayValue(arr.size()); var res = new ArrayValue(arr.size());
res.setSize(arr.size()); res.setSize(arr.size());
for (int i = 0, j = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
if (arr.has(i)) res.set(args.ctx, j++, func.call(args.ctx, thisArg, arr.get(i), i, arr)); if (arr.has(i)) res.set(args.ctx, i, Values.call(args.ctx, args.get(0), args.get(1), arr.get(i), i, arr));
} }
return res; return res;
} }
@ -192,7 +194,14 @@ public class ArrayLib {
var res = args.get(1); var res = args.get(1);
var i = 0; var i = 0;
if (args.n() < 2) for (; !arr.has(i) && i < arr.size(); i++) res = arr.get(i); if (args.n() < 2) {
for (; i < arr.size(); i++) {
if (arr.has(i)){
res = arr.get(i++);
break;
}
}
}
for (; i < arr.size(); i++) { for (; i < arr.size(); i++) {
if (arr.has(i)) { if (arr.has(i)) {
@ -208,7 +217,12 @@ public class ArrayLib {
var res = args.get(1); var res = args.get(1);
var i = arr.size(); var i = arr.size();
if (args.n() < 1) while (!arr.has(i--) && i >= 0) res = arr.get(i); if (args.n() < 2) {
while (!arr.has(i--) && i >= 0) {
res = arr.get(i);
}
}
else i--;
for (; i >= 0; i--) { for (; i >= 0; i--) {
if (arr.has(i)) { if (arr.has(i)) {
@ -252,22 +266,24 @@ public class ArrayLib {
@Expose public static Object __find(Arguments args) { @Expose public static Object __find(Arguments args) {
var arr = args.self(ArrayValue.class); var arr = args.self(ArrayValue.class);
var cmp = args.convert(0, FunctionValue.class);
var thisArg = args.get(1);
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
if (arr.has(i) && Values.toBoolean(cmp.call(args.ctx, thisArg, arr.get(i), i, arr))) return arr.get(i); if (arr.has(i) && Values.toBoolean(Values.call(
args.ctx, args.get(0), args.get(1),
arr.get(i), i, args.self
))) return arr.get(i);
} }
return null; return null;
} }
@Expose public static Object __findLast(Arguments args) { @Expose public static Object __findLast(Arguments args) {
var arr = args.self(ArrayValue.class); var arr = args.self(ArrayValue.class);
var cmp = args.convert(0, FunctionValue.class);
var thisArg = args.get(1);
for (var i = arr.size() - 1; i >= 0; i--) { for (var i = arr.size() - 1; i >= 0; i--) {
if (arr.has(i) && Values.toBoolean(cmp.call(args.ctx, thisArg, arr.get(i), i, arr))) return arr.get(i); if (arr.has(i) && Values.toBoolean(Values.call(
args.ctx, args.get(0), args.get(1),
arr.get(i), i, args.self
))) return arr.get(i);
} }
return null; return null;
@ -275,22 +291,24 @@ public class ArrayLib {
@Expose public static int __findIndex(Arguments args) { @Expose public static int __findIndex(Arguments args) {
var arr = args.self(ArrayValue.class); var arr = args.self(ArrayValue.class);
var cmp = args.convert(0, FunctionValue.class);
var thisArg = args.get(1);
for (int i = 0; i < arr.size(); i++) { for (int i = 0; i < arr.size(); i++) {
if (arr.has(i) && Values.toBoolean(cmp.call(args.ctx, thisArg, arr.get(i), i, arr))) return i; if (arr.has(i) && Values.toBoolean(Values.call(
args.ctx, args.get(0), args.get(1),
arr.get(i), i, args.self
))) return i;
} }
return -1; return -1;
} }
@Expose public static int __findLastIndex(Arguments args) { @Expose public static int __findLastIndex(Arguments args) {
var arr = args.self(ArrayValue.class); var arr = args.self(ArrayValue.class);
var cmp = args.convert(0, FunctionValue.class);
var thisArg = args.get(1);
for (var i = arr.size() - 1; i >= 0; i--) { for (var i = arr.size() - 1; i >= 0; i--) {
if (arr.has(i) && Values.toBoolean(cmp.call(args.ctx, thisArg, arr.get(i), i, arr))) return i; if (arr.has(i) && Values.toBoolean(Values.call(
args.ctx, args.get(0), args.get(1),
arr.get(i), i, args.self
))) return i;
} }
return -1; return -1;
@ -391,7 +409,7 @@ public class ArrayLib {
@Expose public static String __join(Arguments args) { @Expose public static String __join(Arguments args) {
var arr = args.self(ArrayValue.class); var arr = args.self(ArrayValue.class);
var sep = args.getString(0); var sep = args.getString(0, ", ");
var res = new StringBuilder(); var res = new StringBuilder();
var comma = false; var comma = false;
@ -428,7 +446,7 @@ public class ArrayLib {
res.setSize(len); res.setSize(len);
} }
else { else {
var val = args.slice(0).args; var val = args.args;
res = new ArrayValue(val.length); res = new ArrayValue(val.length);
res.copyFrom(args.ctx, val, 0, 0, val.length); res.copyFrom(args.ctx, val, 0, 0, val.length);
} }