Fixup: small details

mozilla · Nov 25, 2024 · 5067e6a · 5067e6a
1 parent 03303eb
commit 5067e6a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/rhino/src/main/java/org/mozilla/javascript/NativeString.java b/rhino/src/main/java/org/mozilla/javascript/NativeString.java
@@ -885,19 +885,19 @@ else if (Normalizer.Form.NFC.name().equals(formStr))
                                 }
                             }
 
-                            Object method = getPropSymbolMatchAll(cx, scope, regexp);
+                            Object matcher = getPropSymbolMatchAll(cx, scope, regexp);
                             // If method is not undefined, it should be a Callable
-                            if (method != null && !Undefined.isUndefined(method)) {
-                                if (!(method instanceof Callable)) {
+                            if (matcher != null && !Undefined.isUndefined(matcher)) {
+                                if (!(matcher instanceof Callable)) {
                                     throw ScriptRuntime.notFunctionError(
-                                            regexp, method, SymbolKey.MATCH_ALL.getName());
+                                            regexp, matcher, SymbolKey.MATCH_ALL.getName());
                                 }
-                                return ((Callable) method)
+                                return ((Callable) matcher)
                                         .call(
                                                 cx,
                                                 scope,
                                                 ScriptRuntime.toObject(scope, regexp),
-                                                new Object[] {thisObj});
+                                                new Object[] {o});
                             }
                         }
 

diff --git a/rhino/src/main/java/org/mozilla/javascript/regexp/NativeRegExpStringIterator.java b/rhino/src/main/java/org/mozilla/javascript/regexp/NativeRegExpStringIterator.java
@@ -68,6 +68,7 @@ protected boolean isDone(Context cx, Scriptable scope) {
         } else if (!global) {
             // Return false at this iteration, but true at the next. Point iii of the spec
             nextDone = true;
+            return false;
         }
 
         // Increment index if matched empty string, as per the spec, point v.

diff --git a/tests/testsrc/jstests/es2020/string-match-all.js b/tests/testsrc/jstests/es2020/string-match-all.js
@@ -132,7 +132,7 @@ function assertIteratorIsDone(iterator) {
 	assertEquals("07", results[5]);
 })();
 
-(function customSymbolMatchAllImplementation() {
+(function nullRegExpShouldMatchLiteralNullString() {
 	const s = "to null or not to null";
 	const results = Array.from(s.matchAll(null));
 	assertEquals(2, results.length);