Skip to content

Commit 9ddd6a6

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

File tree

2 files changed

+33
-11
lines changed

2 files changed

+33
-11
lines changed

.claude/settings.local.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"permissions": {
3+
"allow": [
4+
"Bash(timeout:*)",
5+
"Bash(git fetch:*)",
6+
"Bash(RHINO_TEST_JAVA_VERSION=11 ./gradlew:*)",
7+
"Bash(git cherry-pick:*)",
8+
"Bash(git reset:*)",
9+
"Bash(git checkout:*)",
10+
"Bash(./gradlew compileJava:*)",
11+
"Bash(./gradlew :rhino:compileJava:*)",
12+
"Bash(./gradlew :tests:test:*)",
13+
"Bash(cat:*)",
14+
"Bash(java -jar rhino/build/libs/rhino-1.7.16-SNAPSHOT.jar:*)",
15+
"Bash(java:*)",
16+
"Bash(gh pr view:*)",
17+
"Bash(git log:*)",
18+
"Bash(gh pr list:*)",
19+
"Bash(egrep:*)",
20+
"WebSearch",
21+
"Bash(git push:*)",
22+
"Bash(gh pr create:*)",
23+
"Bash(gh pr diff:*)",
24+
"Bash(./gradlew:*)",
25+
"Bash(/dev/null)",
26+
"WebFetch(domain:raw.githubusercontent.com)"
27+
],
28+
"deny": [],
29+
"ask": []
30+
}
31+
}

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)