fix MatchData#named_captures

jruby · Jul 31, 2018 · 4363a2e · 4363a2e
1 parent 219f62d
commit 4363a2e
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/core/src/main/java/org/jruby/RubyMatchData.java b/core/src/main/java/org/jruby/RubyMatchData.java
@@ -810,27 +810,25 @@ public RubyFixnum hash() {
 
     @JRubyMethod
     public RubyHash named_captures(ThreadContext context) {
+        check();
         Ruby runtime = context.runtime;
-
         RubyHash hash = RubyHash.newHash(runtime);
-
-        if (regexp.getPattern().numberOfNames() > 0) {
-            Iterator<NameEntry> nameEntryIterator = regexp.getPattern().namedBackrefIterator();
-            while (nameEntryIterator.hasNext()) {
-                NameEntry entry = nameEntryIterator.next();
-                RubyString key = RubyString.newStringShared(runtime, new ByteList(entry.name, entry.nameP, entry.nameEnd - entry.nameP, regexp.getEncoding(), false));
-                boolean found = false;
-
-                for (int i : entry.getBackRefs()) {
-                    IRubyObject value = RubyRegexp.nth_match(i, this);
-                    if (value.isTrue()) {
-                        hash.op_asetForString(runtime, key, value);
-                        found = true;
-                    }
+        if (regexp == context.nil) return hash;
+
+        for (Iterator<NameEntry> i = regexp.pattern.namedBackrefIterator(); i.hasNext();) {
+            NameEntry entry = i.next();
+            RubyString key = RubyString.newStringShared(runtime, new ByteList(entry.name, entry.nameP, entry.nameEnd - entry.nameP, regexp.getEncoding(), false));
+            boolean found = false;
+
+            for (int b : entry.getBackRefs()) {
+                IRubyObject value = RubyRegexp.nth_match(b, this);
+                if (value.isTrue()) {
+                    hash.op_asetForString(runtime, key, value);
+                    found = true;
                 }
-
-                if (!found) hash.op_asetForString(runtime, key, context.nil);
             }
+
+            if (!found) hash.op_asetForString(runtime, key, context.nil);
         }
 
         return hash;