Skip to content

Commit 159ccb0

Browse files
committed
Fix API compatibility after rebase on upstream master
1 parent 9a4363a commit 159ccb0

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

rhino/src/main/java/org/mozilla/javascript/NativeES2025Iterator.java

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,8 @@ static void init(Context cx, ScriptableObject scope, boolean sealed) {
2020
LambdaConstructor.CONSTRUCTOR_FUNCTION,
2121
NativeES2025Iterator::constructor);
2222

23-
constructor.defineConstructorMethod(
24-
scope, "from", 1, NativeES2025Iterator::js_from, DONTENUM);
25-
constructor.defineConstructorMethod(
26-
scope, "concat", 0, NativeES2025Iterator::js_concat, DONTENUM);
23+
constructor.defineConstructorMethod(scope, "from", 1, NativeES2025Iterator::js_from);
24+
constructor.defineConstructorMethod(scope, "concat", 0, NativeES2025Iterator::js_concat);
2725

2826
constructor.definePrototypeMethod(
2927
scope,
@@ -160,13 +158,6 @@ private static Object getValue(Scriptable result) {
160158
return ScriptableObject.getProperty(result, "value");
161159
}
162160

163-
private static void closeIterator(Context cx, Scriptable scope, Scriptable iterator) {
164-
Object returnMethod = ScriptableObject.getProperty(iterator, "return");
165-
if (returnMethod instanceof Callable) {
166-
((Callable) returnMethod).call(cx, scope, iterator, ScriptRuntime.emptyArgs);
167-
}
168-
}
169-
170161
private static Object js_toArray(
171162
Context cx, Scriptable scope, Scriptable thisObj, Object[] args) {
172163
Callable nextMethod = getNextMethod(thisObj);

0 commit comments

Comments
 (0)