strscan 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45d46129cae1a1b9273f5500d6d15279e592946173312c034fb54387faef9d0d
-  data.tar.gz: fc2d15f94f2e597d57dc89c44dddce16aa0096f02a6d268c22e1595ab9c5a00f
+  metadata.gz: 721eeedd937d05ca382b444254fba9a33c4b5c31851e50c4dbdd577bf6500cbc
+  data.tar.gz: 60b383fe5478479a7888f1c11da32abbcbc98e223697b4255b9bff88f97adb55
 SHA512:
-  metadata.gz: 295727ce636512083608565f16c7675509143708abce6896da39fb0b3bad4d8e69538b6574a0ed6c6d7e0f85c14569c79cdc5901b55c7c5320c3d5a7af0cc61d
-  data.tar.gz: 4bba01c59eb8e3062fb498d6e8468ed6def6fa36d7c5ef9a0bb24806f7d500def565e9598eb5b7958589b3145653b57991a270963d066486b4e1ba915cb3030f
+  metadata.gz: af10ae102cc3b960eec9bad084d434a436a847effbc265c03e63aeafbcfae537a45c902af4a05499f424a9a050053cc630477eca652b5a1e031548228e796ae8
+  data.tar.gz: 101a27af7c1f3d9eb46a2ee3e6e62b279d934d02f2e0e89d756c36699205ab66d3316e49692a19a2a872ac4c34810d9f11c58e8314d8546f4c4b69614c0db240

data/doc/strscan/helper_methods.md

@@ -10,7 +10,7 @@ Display scanner's situation:
 - Character position (`#charpos`)
 - Target string (`#rest`) and size (`#rest_size`).
 
-```
+```rb
 scanner = StringScanner.new('foobarbaz')
 scanner.scan(/foo/)
 put_situation(scanner)
@@ -25,7 +25,7 @@ put_situation(scanner)
 
 Display the scanner's match values:
 
-```
+```rb
 scanner = StringScanner.new('Fri Dec 12 1975 14:39')
 pattern = /(?<wday>\w+) (?<month>\w+) (?<day>\d+) /
 scanner.match?(pattern)
@@ -53,7 +53,7 @@ put_match_values(scanner)
 
 Returns whether the scanner's match values are all properly cleared:
 
-```
+```rb
 scanner = StringScanner.new('foobarbaz')
 match_values_cleared?(scanner) # => true
 put_match_values(scanner)
@@ -75,7 +75,7 @@ match_values_cleared?(scanner) # => false
 
 ## The Code
 
-```
+```rb
 def put_situation(scanner)
   puts '# Situation:'
   puts "#   pos:       #{scanner.pos}"
@@ -83,9 +83,7 @@ def put_situation(scanner)
   puts "#   rest:      #{scanner.rest.inspect}"
   puts "#   rest_size: #{scanner.rest_size}"
 end
-```
 
-```
 def put_match_values(scanner)
   puts '# Basic match values:'
   puts "#   matched?:       #{scanner.matched?}"
@@ -109,9 +107,7 @@ def put_match_values(scanner)
     end
   end
 end
-```
 
-```
 def match_values_cleared?(scanner)
   scanner.matched? == false &&
     scanner.matched_size.nil? &&

data/doc/strscan/methods/get_byte.md

@@ -10,7 +10,7 @@ Returns the next byte, if available:
     - Increments the [byte position][2].
     - Adjusts the [character position][7].
 
-    ```
+    ```rb
     scanner = StringScanner.new(HIRAGANA_TEXT)
     # => #<StringScanner 0/15 @ "\xE3\x81\x93\xE3\x82...">
     scanner.string                                   # => "こんにちは"
@@ -24,7 +24,7 @@ Returns the next byte, if available:
 
 - Otherwise, returns `nil`, and does not change the positions.
 
-    ```
+    ```rb
     scanner.terminate
     [scanner.get_byte, scanner.pos, scanner.charpos] # => [nil, 15, 5]
     ```

data/doc/strscan/methods/get_charpos.md

@@ -5,7 +5,7 @@ Returns the [character position][7] (initially zero),
 which may be different from the [byte position][2]
 given by method #pos:
 
-```
+```rb
 scanner = StringScanner.new(HIRAGANA_TEXT)
 scanner.string # => "こんにちは"
 scanner.getch  # => "こ" # 3-byte character.

data/doc/strscan/methods/get_pos.md

@@ -4,7 +4,7 @@ call-seq:
 Returns the integer [byte position][2],
 which may be different from the [character position][7]:
 
-```
+```rb
 scanner = StringScanner.new(HIRAGANA_TEXT)
 scanner.string  # => "こんにちは"
 scanner.pos     # => 0

data/doc/strscan/methods/getch.md

@@ -12,7 +12,7 @@ if available:
     - Increments the [byte position][2]
       by the size (in bytes) of the character.
 
-    ```
+    ```rb
     scanner = StringScanner.new(HIRAGANA_TEXT)
     scanner.string                                # => "こんにちは"
     [scanner.getch, scanner.pos, scanner.charpos] # => ["こ", 3, 1]
@@ -27,7 +27,7 @@ if available:
   (that is, not at its beginning),
   behaves like #get_byte (returns a 1-byte character):
 
-    ```
+    ```rb
     scanner.pos = 1
     [scanner.getch, scanner.pos, scanner.charpos] # => ["\x81", 2, 2]
     [scanner.getch, scanner.pos, scanner.charpos] # => ["\x93", 3, 1]
@@ -37,7 +37,7 @@ if available:
 - If the [position][2] is at the end of the [stored string][1],
   returns `nil` and does not modify the positions:
 
-    ```
+    ```rb
     scanner.terminate
     [scanner.getch, scanner.pos, scanner.charpos] # => [nil, 15, 5]
     ```

data/doc/strscan/methods/scan.md

@@ -11,7 +11,7 @@ If the match succeeds:
   and may increment the [character position][7].
 - Sets [match values][9].
 
-```
+```rb
 scanner = StringScanner.new(HIRAGANA_TEXT)
 scanner.string     # => "こんにちは"
 scanner.pos = 6
@@ -45,7 +45,7 @@ If the match fails:
 - Does not increment byte and character positions.
 - Clears match values.
 
-```
+```rb
 scanner.scan(/nope/)           # => nil
 match_values_cleared?(scanner) # => true
 ```

data/doc/strscan/methods/scan_until.md

@@ -12,7 +12,7 @@ If the match attempt succeeds:
 - Returns the matched substring.
 
 
-```
+```rb
 scanner = StringScanner.new(HIRAGANA_TEXT)
 scanner.string           # => "こんにちは"
 scanner.pos = 6
@@ -46,7 +46,7 @@ If the match attempt fails:
 - Returns `nil`.
 - Does not update positions.
 
-```
+```rb
 scanner.scan_until(/nope/)     # => nil
 match_values_cleared?(scanner) # => true
 ```

data/doc/strscan/methods/set_pos.md

@@ -9,7 +9,7 @@ Does not affect [match values][9].
 
 For non-negative `n`, sets the position to `n`:
 
-```
+```rb
 scanner = StringScanner.new(HIRAGANA_TEXT)
 scanner.string  # => "こんにちは"
 scanner.pos = 3 # => 3
@@ -19,7 +19,7 @@ scanner.charpos # => 1
 
 For negative `n`, counts from the end of the [stored string][1]:
 
-```
+```rb
 scanner.pos = -9 # => -9
 scanner.pos      # => 6
 scanner.rest     # => "にちは"

data/doc/strscan/methods/skip.md

@@ -11,7 +11,7 @@ If the match succeeds:
 - Sets [match values][9].
 - Returns the size (bytes) of the matched substring.
 
-```
+```rb
 scanner = StringScanner.new(HIRAGANA_TEXT)
 scanner.string                  # => "こんにちは"
 scanner.pos = 6

data/doc/strscan/methods/skip_until.md

@@ -10,7 +10,7 @@ If the match attempt succeeds:
 - Sets [match values][9].
 - Returns the size of the matched substring.
 
-```
+```rb
 scanner = StringScanner.new(HIRAGANA_TEXT)
 scanner.string           # => "こんにちは"
 scanner.pos = 6
@@ -43,7 +43,7 @@ If the match attempt fails:
 - Clears match values.
 - Returns `nil`.
 
-```
+```rb
 scanner.skip_until(/nope/)     # => nil
 match_values_cleared?(scanner) # => true
 ```

data/doc/strscan/methods/terminate.md

@@ -7,7 +7,7 @@ returns +self+:
 - Sets both [positions][11] to end-of-stream.
 - Clears [match values][9].
 
-```
+```rb
 scanner = StringScanner.new(HIRAGANA_TEXT)
 scanner.string                 # => "こんにちは"
 scanner.scan_until(/に/)

data/doc/strscan/strscan.md

@@ -1,7 +1,7 @@
 \Class `StringScanner` supports processing a stored string as a stream;
 this code creates a new `StringScanner` object with string `'foobarbaz'`:
 
-```
+```rb
 require 'strscan'
 scanner = StringScanner.new('foobarbaz')
 ```
@@ -10,13 +10,13 @@ scanner = StringScanner.new('foobarbaz')
 
 All examples here assume that `StringScanner` has been required:
 
-```
+```rb
 require 'strscan'
 ```
 
 Some examples here assume that these constants are defined:
 
-```
+```rb
 MULTILINE_TEXT = <<~EOT
 Go placidly amid the noise and haste,
 and remember what peace there may be in silence.
@@ -45,7 +45,7 @@ This code creates a `StringScanner` object
 (we'll call it simply a _scanner_),
 and shows some of its basic properties:
 
-```
+```rb
 scanner = StringScanner.new('foobarbaz')
 scanner.string # => "foobarbaz"
 put_situation(scanner)
@@ -112,11 +112,11 @@ and a zero-based <i>character position</i>.
 
 Each of these methods explicitly sets positions:
 
-| Method                   | Effect                                                   |
-|--------------------------|----------------------------------------------------------|
-| #reset                   | Sets both positions to zero (begining of stored string). |
-| #terminate               | Sets both positions to the end of the stored string.     |
-| #pos=(new_byte_position) | Sets byte position; adjusts character position.          |
+| Method                   | Effect                                                    |
+|--------------------------|-----------------------------------------------------------|
+| #reset                   | Sets both positions to zero (beginning of stored string). |
+| #terminate               | Sets both positions to the end of the stored string.      |
+| #pos=(new_byte_position) | Sets byte position; adjusts character position.           |
 
 ### Byte Position (Position)
 
@@ -138,7 +138,7 @@ To get or set the byte position:
 Many methods use the byte position as the basis for finding matches;
 many others set, increment, or decrement the byte position:
 
-```
+```rb
 scanner = StringScanner.new('foobar')
 scanner.pos # => 0
 scanner.scan(/foo/) # => "foo" # Match found.
@@ -176,7 +176,7 @@ see:
 
 Example (string includes multi-byte characters):
 
-```
+```rb
 scanner = StringScanner.new(ENGLISH_TEXT) # Five 1-byte characters.
 scanner.concat(HIRAGANA_TEXT)             # Five 3-byte characters
 scanner.string # => "Helloこんにちは"       # Twenty bytes in all.
@@ -216,7 +216,7 @@ and its size is returned by method #rest_size.
 
 Examples:
 
-```
+```rb
 scanner = StringScanner.new('foobarbaz')
 put_situation(scanner)
 # Situation:
@@ -430,7 +430,7 @@ See examples below.
 
 Successful basic match attempt (no captures):
 
-```
+```rb
 scanner = StringScanner.new('foobarbaz')
 scanner.exist?(/bar/)
 put_match_values(scanner)
@@ -452,7 +452,7 @@ put_match_values(scanner)
 
 Failed basic match attempt (no captures);
 
-```
+```rb
 scanner = StringScanner.new('foobarbaz')
 scanner.exist?(/nope/)
 match_values_cleared?(scanner) # => true
@@ -460,7 +460,7 @@ match_values_cleared?(scanner) # => true
 
 Successful unnamed capture match attempt:
 
-```
+```rb
 scanner = StringScanner.new('foobarbazbatbam')
 scanner.exist?(/(foo)bar(baz)bat(bam)/)
 put_match_values(scanner)
@@ -486,7 +486,7 @@ put_match_values(scanner)
 Successful named capture match attempt;
 same as unnamed above, except for #named_captures:
 
-```
+```rb
 scanner = StringScanner.new('foobarbazbatbam')
 scanner.exist?(/(?<x>foo)bar(?<y>baz)bat(?<z>bam)/)
 scanner.named_captures # => {"x"=>"foo", "y"=>"baz", "z"=>"bam"}
@@ -494,7 +494,7 @@ scanner.named_captures # => {"x"=>"foo", "y"=>"baz", "z"=>"bam"}
 
 Failed unnamed capture match attempt:
 
-```
+```rb
 scanner = StringScanner.new('somestring')
 scanner.exist?(/(foo)bar(baz)bat(bam)/)
 match_values_cleared?(scanner) # => true
@@ -503,7 +503,7 @@ match_values_cleared?(scanner) # => true
 Failed named capture match attempt;
 same as unnamed above, except for #named_captures:
 
-```
+```rb
 scanner = StringScanner.new('somestring')
 scanner.exist?(/(?<x>foo)bar(?<y>baz)bat(?<z>bam)/)
 match_values_cleared?(scanner) # => false
@@ -518,7 +518,7 @@ which determines the meaning of `'\A'`:
 
 * `false` (the default): matches the current byte position.
 
-    ```
+    ```rb
     scanner = StringScanner.new('foobar')
     scanner.scan(/\A./) # => "f"
     scanner.scan(/\A./) # => "o"
@@ -529,7 +529,7 @@ which determines the meaning of `'\A'`:
 * `true`: matches the beginning of the target substring;
   never matches unless the byte position is zero:
 
-    ```
+    ```rb
     scanner = StringScanner.new('foobar', fixed_anchor: true)
     scanner.scan(/\A./) # => "f"
     scanner.scan(/\A./) # => nil

data/ext/strscan/strscan.c

@@ -22,7 +22,7 @@ extern size_t onig_region_memsize(const struct re_registers *regs);
 
 #include <stdbool.h>
 
-#define STRSCAN_VERSION "3.1.1"
+#define STRSCAN_VERSION "3.1.3"
 
 /* =======================================================================
                          Data Type Definitions
@@ -58,8 +58,13 @@ struct strscanner
 };
 
 #define MATCHED_P(s)          ((s)->flags & FLAG_MATCHED)
-#define MATCHED(s)             (s)->flags |= FLAG_MATCHED
-#define CLEAR_MATCH_STATUS(s)  (s)->flags &= ~FLAG_MATCHED
+#define MATCHED(s)            ((s)->flags |= FLAG_MATCHED)
+#define CLEAR_MATCHED(s)      ((s)->flags &= ~FLAG_MATCHED)
+#define CLEAR_NAMED_CAPTURES(s) ((s)->regex = Qnil)
+#define CLEAR_MATCH_STATUS(s) do {\
+    CLEAR_MATCHED(s);\
+    CLEAR_NAMED_CAPTURES(s);\
+} while (0)
 
 #define S_PBEG(s)  (RSTRING_PTR((s)->str))
 #define S_LEN(s)  (RSTRING_LEN((s)->str))
@@ -216,7 +221,6 @@ strscan_s_allocate(VALUE klass)
     CLEAR_MATCH_STATUS(p);
     onig_region_init(&(p->regs));
     p->str = Qnil;
-    p->regex = Qnil;
     return obj;
 }
 
@@ -231,7 +235,7 @@ strscan_s_allocate(VALUE klass)
  * is the given `string`;
  * sets the [fixed-anchor property][10]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.string        # => "foobarbaz"
  * scanner.fixed_anchor? # => false
@@ -339,7 +343,7 @@ strscan_s_mustc(VALUE self)
  * and clears [match values][9];
  * returns +self+:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.exist?(/bar/)          # => 6
  * scanner.reset                  # => #<StringScanner 0/9 @ "fooba...">
@@ -405,7 +409,7 @@ strscan_clear(VALUE self)
  *
  * Returns the [stored string][1]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobar')
  * scanner.string # => "foobar"
  * scanner.concat('baz')
@@ -435,7 +439,7 @@ strscan_get_string(VALUE self)
  * - Clears [match values][9].
  * - Returns `other_string`.
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobar')
  * scanner.scan(/foo/)
  * put_situation(scanner)
@@ -483,7 +487,7 @@ strscan_set_string(VALUE self, VALUE str)
  *   or [match values][9].
  *
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foo')
  * scanner.string           # => "foo"
  * scanner.terminate
@@ -520,7 +524,7 @@ strscan_get_pos(VALUE self)
     struct strscanner *p;
 
     GET_SCANNER(self, p);
-    return INT2FIX(p->curr);
+    return LONG2NUM(p->curr);
 }
 
 /*
@@ -550,7 +554,7 @@ strscan_set_pos(VALUE self, VALUE v)
     long i;
 
     GET_SCANNER(self, p);
-    i = NUM2INT(v);
+    i = NUM2LONG(v);
     if (i < 0) i += S_LEN(p);
     if (i < 0) rb_raise(rb_eRangeError, "index out of range");
     if (i > S_LEN(p)) rb_raise(rb_eRangeError, "index out of range");
@@ -571,19 +575,20 @@ match_target(struct strscanner *p)
 }
 
 static inline void
-set_registers(struct strscanner *p, size_t length)
+set_registers(struct strscanner *p, size_t pos, size_t length)
 {
     const int at = 0;
     OnigRegion *regs = &(p->regs);
     onig_region_clear(regs);
     if (onig_region_set(regs, at, 0, 0)) return;
     if (p->fixed_anchor_p) {
-        regs->beg[at] = p->curr;
-        regs->end[at] = p->curr + length;
+        regs->beg[at] = pos + p->curr;
+        regs->end[at] = pos + p->curr + length;
     }
     else
     {
-        regs->end[at] = length;
+        regs->beg[at] = pos;
+        regs->end[at] = pos + length;
     }
 }
 
@@ -731,7 +736,7 @@ strscan_do_scan(VALUE self, VALUE pattern, int succptr, int getstr, int headonly
             if (memcmp(CURPTR(p), RSTRING_PTR(pattern), RSTRING_LEN(pattern)) != 0) {
                 return Qnil;
             }
-            set_registers(p, RSTRING_LEN(pattern));
+            set_registers(p, 0, RSTRING_LEN(pattern));
         }
         else {
             rb_encoding *enc = rb_enc_check(p->str, pattern);
@@ -740,7 +745,7 @@ strscan_do_scan(VALUE self, VALUE pattern, int succptr, int getstr, int headonly
             if (pos == -1) {
                 return Qnil;
             }
-            set_registers(p, RSTRING_LEN(pattern) + pos);
+            set_registers(p, pos, RSTRING_LEN(pattern));
         }
     }
 
@@ -789,7 +794,7 @@ strscan_scan(VALUE self, VALUE re)
  * - Returns the size in bytes of the matched substring.
  *
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.pos = 3
  * scanner.match?(/bar/) => 3
@@ -822,7 +827,7 @@ strscan_scan(VALUE self, VALUE re)
  * - Returns `nil`.
  * - Does not increment positions.
  *
- * ```
+ * ```rb
  * scanner.match?(/nope/)         # => nil
  * match_values_cleared?(scanner) # => true
  * ```
@@ -861,7 +866,7 @@ strscan_skip(VALUE self, VALUE re)
  * - Returns the matched substring.
  * - Sets all [match values][9].
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.pos = 3
  * scanner.check('bar') # => "bar"
@@ -894,7 +899,7 @@ strscan_skip(VALUE self, VALUE re)
  * - Returns `nil`.
  * - Clears all [match values][9].
  *
- * ```
+ * ```rb
  * scanner.check(/nope/)          # => nil
  * match_values_cleared?(scanner) # => true
  * ```
@@ -961,7 +966,7 @@ strscan_scan_until(VALUE self, VALUE re)
  *   and the end of the matched substring.
  * - Sets all [match values][9].
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbazbatbam')
  * scanner.pos = 6
  * scanner.exist?(/bat/) # => 6
@@ -993,7 +998,7 @@ strscan_scan_until(VALUE self, VALUE re)
  * - Returns `nil`.
  * - Clears all [match values][9].
  *
- * ```
+ * ```rb
  * scanner.exist?(/nope/)         # => nil
  * match_values_cleared?(scanner) # => true
  * ```
@@ -1035,7 +1040,7 @@ strscan_skip_until(VALUE self, VALUE re)
  *   which extends from the current [position][2]
  *   to the end of the matched substring.
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbazbatbam')
  * scanner.pos = 6
  * scanner.check_until(/bat/) # => "bazbat"
@@ -1067,7 +1072,7 @@ strscan_skip_until(VALUE self, VALUE re)
  * - Clears all [match values][9].
  * - Returns `nil`.
  *
- * ```
+ * ```rb
  * scanner.check_until(/nope/)    # => nil
  * match_values_cleared?(scanner) # => true
  * ```
@@ -1239,7 +1244,7 @@ strscan_getbyte(VALUE self)
  * Returns the substring `string[pos, length]`;
  * does not update [match values][9] or [positions][11]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.pos = 3
  * scanner.peek(3)   # => "bar"
@@ -1292,6 +1297,10 @@ strscan_parse_integer(struct strscanner *p, int base, long len)
     integer = rb_cstr2inum(buffer, base);
     RB_ALLOCV_END(buffer_v);
     p->curr += len;
+
+    MATCHED(p);
+    adjust_registers_to_matched(p);
+
     return integer;
 }
 
@@ -1341,7 +1350,6 @@ strscan_scan_base10_integer(VALUE self)
         return Qnil;
     }
 
-    MATCHED(p);
     p->prev = p->curr;
 
     while (len < remaining_len && rb_isdigit(ptr[len])) {
@@ -1375,7 +1383,7 @@ strscan_scan_base16_integer(VALUE self)
         len++;
     }
 
-    if ((remaining_len >= (len + 2)) && ptr[len] == '0' && ptr[len + 1] == 'x') {
+    if ((remaining_len >= (len + 3)) && ptr[len] == '0' && ptr[len + 1] == 'x' && rb_isxdigit(ptr[len + 2])) {
         len += 2;
     }
 
@@ -1383,7 +1391,6 @@ strscan_scan_base16_integer(VALUE self)
         return Qnil;
     }
 
-    MATCHED(p);
     p->prev = p->curr;
 
     while (len < remaining_len && rb_isxdigit(ptr[len])) {
@@ -1403,7 +1410,7 @@ strscan_scan_base16_integer(VALUE self)
  * Sets the [position][2] to its value previous to the recent successful
  * [match][17] attempt:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.scan(/foo/)
  * put_situation(scanner)
@@ -1424,7 +1431,7 @@ strscan_scan_base16_integer(VALUE self)
  *
  * Raises an exception if match values are clear:
  *
- * ```
+ * ```rb
  * scanner.scan(/nope/)           # => nil
  * match_values_cleared?(scanner) # => true
  * scanner.unscan                 # Raises StringScanner::Error.
@@ -1498,7 +1505,7 @@ strscan_bol_p(VALUE self)
  * Returns whether the [position][2]
  * is at the end of the [stored string][1]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.eos? # => false
  * pos = 3
@@ -1567,7 +1574,7 @@ strscan_rest_p(VALUE self)
  * `false` otherwise;
  * see [Basic Matched Values][18]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.matched?       # => false
  * scanner.pos = 3
@@ -1599,7 +1606,7 @@ strscan_matched_p(VALUE self)
  * or `nil` otherwise;
  * see [Basic Matched Values][18]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.matched        # => nil
  * scanner.pos = 3
@@ -1634,7 +1641,7 @@ strscan_matched(VALUE self)
  * or `nil` otherwise;
  * see [Basic Matched Values][18]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.matched_size   # => nil
  *
@@ -1660,19 +1667,17 @@ strscan_matched_size(VALUE self)
 static int
 name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name, const char* name_end, rb_encoding *enc)
 {
-    int num;
-
-    num = onig_name_to_backref_number(RREGEXP_PTR(regexp),
-	(const unsigned char* )name, (const unsigned char* )name_end, regs);
-    if (num >= 1) {
-	return num;
-    }
-    else {
-	rb_enc_raise(enc, rb_eIndexError, "undefined group name reference: %.*s",
-					  rb_long2int(name_end - name), name);
+    if (RTEST(regexp)) {
+        int num = onig_name_to_backref_number(RREGEXP_PTR(regexp),
+                                              (const unsigned char* )name,
+                                              (const unsigned char* )name_end,
+                                              regs);
+        if (num >= 1) {
+	        return num;
+        }
     }
-
-    UNREACHABLE;
+    rb_enc_raise(enc, rb_eIndexError, "undefined group name reference: %.*s",
+                 rb_long2int(name_end - name), name);
 }
 
 /*
@@ -1688,14 +1693,14 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
  *
  * When there are captures:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('Fri Dec 12 1975 14:39')
  * scanner.scan(/(?<wday>\w+) (?<month>\w+) (?<day>\d+) /)
  * ```
  *
  * - `specifier` zero: returns the entire matched substring:
  *
- *     ```
+ *     ```rb
  *     scanner[0]         # => "Fri Dec 12 "
  *     scanner.pre_match  # => ""
  *     scanner.post_match # => "1975 14:39"
@@ -1703,7 +1708,7 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
  *
  * - `specifier` positive integer. returns the `n`th capture, or `nil` if out of range:
  *
- *     ```
+ *     ```rb
  *     scanner[1] # => "Fri"
  *     scanner[2] # => "Dec"
  *     scanner[3] # => "12"
@@ -1712,7 +1717,7 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
  *
  * - `specifier` negative integer. counts backward from the last subgroup:
  *
- *     ```
+ *     ```rb
  *     scanner[-1] # => "12"
  *     scanner[-4] # => "Fri Dec 12 "
  *     scanner[-5] # => nil
@@ -1720,7 +1725,7 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
  *
  * - `specifier` symbol or string. returns the named subgroup, or `nil` if no such:
  *
- *     ```
+ *     ```rb
  *     scanner[:wday]  # => "Fri"
  *     scanner['wday'] # => "Fri"
  *     scanner[:month] # => "Dec"
@@ -1730,7 +1735,7 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
  *
  * When there are no captures, only `[0]` returns non-`nil`:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.exist?(/bar/)
  * scanner[0] # => "bar"
@@ -1739,7 +1744,7 @@ name_to_backref_number(struct re_registers *regs, VALUE regexp, const char* name
  *
  * For a failed match, even `[0]` returns `nil`:
  *
- * ```
+ * ```rb
  * scanner.scan(/nope/) # => nil
  * scanner[0]           # => nil
  * scanner[1]           # => nil
@@ -1761,7 +1766,6 @@ strscan_aref(VALUE self, VALUE idx)
             idx = rb_sym2str(idx);
             /* fall through */
         case T_STRING:
-            if (!RTEST(p->regex)) return Qnil;
             RSTRING_GETMEM(idx, name, i);
             i = name_to_backref_number(&(p->regs), p->regex, name, name + i, rb_enc_get(idx));
             break;
@@ -1790,7 +1794,7 @@ strscan_aref(VALUE self, VALUE idx)
  * Returns the count of captures if the most recent match attempt succeeded, `nil` otherwise;
  * see [Captures Match Values][13]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('Fri Dec 12 1975 14:39')
  * scanner.size                        # => nil
  *
@@ -1824,7 +1828,7 @@ strscan_size(VALUE self)
  * Returns the array of [captured match values][13] at indexes `(1..)`
  * if the most recent match attempt succeeded, or `nil` otherwise:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('Fri Dec 12 1975 14:39')
  * scanner.captures         # => nil
  *
@@ -1879,7 +1883,7 @@ strscan_captures(VALUE self)
  * For each `specifier`, the returned substring is `[specifier]`;
  * see #[].
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('Fri Dec 12 1975 14:39')
  * pattern = /(?<wday>\w+) (?<month>\w+) (?<day>\d+) /
  * scanner.match?(pattern)
@@ -1919,7 +1923,7 @@ strscan_values_at(int argc, VALUE *argv, VALUE self)
  * or `nil` otherwise;
  * see [Basic Match Values][18]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.pre_match      # => nil
  *
@@ -1956,7 +1960,7 @@ strscan_pre_match(VALUE self)
  * or `nil` otherwise;
  * see [Basic Match Values][18]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.post_match     # => nil
  *
@@ -1991,7 +1995,7 @@ strscan_post_match(VALUE self)
  * Returns the 'rest' of the [stored string][1] (all after the current [position][2]),
  * which is the [target substring][3]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.rest # => "foobarbaz"
  * scanner.pos = 3
@@ -2022,7 +2026,7 @@ strscan_rest(VALUE self)
  *
  * Returns the size (in bytes) of the #rest of the [stored string][1]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('foobarbaz')
  * scanner.rest      # => "foobarbaz"
  * scanner.rest_size # => 9
@@ -2081,7 +2085,7 @@ strscan_restsize(VALUE self)
  * 3. The substring preceding the current position.
  * 4. The substring following the current position (which is also the [target substring][3]).
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new("Fri Dec 12 1975 14:39")
  * scanner.pos = 11
  * scanner.inspect # => "#<StringScanner 11/21 \"...c 12 \" @ \"1975 ...\">"
@@ -2089,14 +2093,14 @@ strscan_restsize(VALUE self)
  *
  * If at beginning-of-string, item 4 above (following substring) is omitted:
  *
- * ```
+ * ```rb
  * scanner.reset
  * scanner.inspect # => "#<StringScanner 0/21 @ \"Fri D...\">"
  * ```
  *
  * If at end-of-string, all items above are omitted:
  *
- * ```
+ * ```rb
  * scanner.terminate
  * scanner.inspect # => "#<StringScanner fin>"
  * ```
@@ -2224,7 +2228,7 @@ named_captures_iter(const OnigUChar *name,
  * if the most recent match attempt succeeded, or nil otherwise;
  * see [Captured Match Values][13]:
  *
- * ```
+ * ```rb
  * scanner = StringScanner.new('Fri Dec 12 1975 14:39')
  * scanner.named_captures # => {}
  *

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: strscan
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.3
 platform: ruby
 authors:
 - Minero Aoki
 - Sutou Kouhei
 - Charles Oliver Nutter
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2025-04-13 00:00:00.000000000 Z
 dependencies: []
 description: Provides lexical scanning operations on a String.
 email:
@@ -60,7 +59,6 @@ licenses:
 - Ruby
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options:
 - "-idoc"
 require_paths:
@@ -76,8 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Provides lexical scanning operations on a String.
 test_files: []