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

refactor: use new iterable names

Browse Source
This commit is contained in:
TopchetoEU 2023-11-25 18:43:43 +02:00
parent 4a1473c5be
commit f0ad936e5b
Signed by: topchetoeu
GPG Key ID: 6531B8583E5F6ED4
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/me/topchetoeu/jscript/lib/MapLib.java
View File

@ -35,15 +35,15 @@ import me.topchetoeu.jscript.interop.NativeGetter;
var res = map.entrySet().stream().map(v -> { var res = map.entrySet().stream().map(v -> {
return new ArrayValue(ctx, v.getKey(), v.getValue()); return new ArrayValue(ctx, v.getKey(), v.getValue());
}).collect(Collectors.toList()); }).collect(Collectors.toList());
return Values.fromJavaIterator(ctx, res.iterator()); return Values.toJSIterator(ctx, res.iterator());
} }
@Native public ObjectValue keys(Context ctx) { @Native public ObjectValue keys(Context ctx) {
var res = new ArrayList<>(map.keySet()); var res = new ArrayList<>(map.keySet());
return Values.fromJavaIterator(ctx, res.iterator()); return Values.toJSIterator(ctx, res.iterator());
} }
@Native public ObjectValue values(Context ctx) { @Native public ObjectValue values(Context ctx) {
var res = new ArrayList<>(map.values()); var res = new ArrayList<>(map.values());
return Values.fromJavaIterator(ctx, res.iterator()); return Values.toJSIterator(ctx, res.iterator());
} }
@Native public Object get(Object key) { @Native public Object get(Object key) {
@ -68,7 +68,7 @@ import me.topchetoeu.jscript.interop.NativeGetter;
} }
@Native public MapLib(Context ctx, Object iterable) { @Native public MapLib(Context ctx, Object iterable) {
for (var el : Values.toJavaIterable(ctx, iterable)) { for (var el : Values.fromJSIterator(ctx, iterable)) {
try { try {
set(Values.getMember(ctx, el, 0), Values.getMember(ctx, el, 1)); set(Values.getMember(ctx, el, 0), Values.getMember(ctx, el, 1));
} }

2
src/me/topchetoeu/jscript/lib/RegExpLib.java
View File

@ -153,7 +153,7 @@ import me.topchetoeu.jscript.interop.NativeGetter;
@Native("@@Symbol.matchAll") public Object matchAll(Context ctx, String target) { @Native("@@Symbol.matchAll") public Object matchAll(Context ctx, String target) {
var pattern = new RegExpLib(this.source, this.flags() + "g"); var pattern = new RegExpLib(this.source, this.flags() + "g");
return Values.fromJavaIterator(ctx, new Iterator<Object>() { return Values.toJSIterator(ctx, new Iterator<Object>() {
private Object val = null; private Object val = null;
private boolean updated = false; private boolean updated = false;

8
src/me/topchetoeu/jscript/lib/SetLib.java
View File

@ -22,15 +22,15 @@ import me.topchetoeu.jscript.interop.NativeGetter;
@Native public ObjectValue entries(Context ctx) { @Native public ObjectValue entries(Context ctx) {
var res = set.stream().map(v -> new ArrayValue(ctx, v, v)).collect(Collectors.toList()); var res = set.stream().map(v -> new ArrayValue(ctx, v, v)).collect(Collectors.toList());
return Values.fromJavaIterator(ctx, res.iterator()); return Values.toJSIterator(ctx, res.iterator());
} }
@Native public ObjectValue keys(Context ctx) { @Native public ObjectValue keys(Context ctx) {
var res = new ArrayList<>(set); var res = new ArrayList<>(set);
return Values.fromJavaIterator(ctx, res.iterator()); return Values.toJSIterator(ctx, res.iterator());
} }
@Native public ObjectValue values(Context ctx) { @Native public ObjectValue values(Context ctx) {
var res = new ArrayList<>(set); var res = new ArrayList<>(set);
return Values.fromJavaIterator(ctx, res.iterator()); return Values.toJSIterator(ctx, res.iterator());
} }
@Native public Object add(Object key) { @Native public Object add(Object key) {
@ -58,6 +58,6 @@ import me.topchetoeu.jscript.interop.NativeGetter;
} }
@Native public SetLib(Context ctx, Object iterable) { @Native public SetLib(Context ctx, Object iterable) {
for (var el : Values.toJavaIterable(ctx, iterable)) add(el); for (var el : Values.fromJSIterator(ctx, iterable)) add(el);
} }
} }