fix: 追加レビューの境界入力を処理 / Handle review edge cases

Author: inakaegg

CHANGELOG.md

@@ -5,7 +5,7 @@
 ### Fixed
 - Parameterless commands now reject unexpected arguments without invoking the target method or attempting implicit return-value traversal.
 - Required options now report a missing value instead of consuming the following option token, while explicit values such as `true` remain valid.
-- Required options accept negative exponent and radix notation such as `-1e3` and `-0x10` without mistaking them for another option.
+- Required options accept negative exponent, digit-separated decimal, and radix notation such as `-1e3`, `-1_000`, and `-0x10` without mistaking them for another option.
 - Constant discovery now includes classes and modules assigned with `Class.new` / `Module.new` during the target file load.
 - Repeated loads retain assigned constant aliases when the source file is unchanged.
 - Repeated loads retain aliases from completed direct, multiple, and `const_set` assignments or matching fully qualified existence guards, without reviving failed assignments or aliases behind disabled conditions.

lib/rubycli/argument_parser.rb

@@ -785,7 +785,10 @@ def looks_like_option?(token)
       return false unless token
       return false if token == '--' || token == '-'
 
-      negative_decimal = token.match?(/\A-(?:\d+(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+)?\z/)
+      decimal_digits = '\d(?:_?\d)*'
+      negative_decimal = token.match?(
+        /\A-(?:#{decimal_digits}(?:\.(?:#{decimal_digits})?)?|\.#{decimal_digits})(?:[eE][+-]?#{decimal_digits})?\z/
+      )
       negative_radix = token.match?(
         /\A-0(?:[xX][0-9a-fA-F_]+|[bB][01_]+|[oO][0-7_]+|[dD][0-9_]+)\z/
       )

lib/rubycli/constant_capture.rb

@@ -466,13 +466,28 @@ def unwrap_guard_condition(condition, expected)
 
           condition = condition[2]
           expected = !expected
+        when :call
+          break unless condition.dig(3, 1) == 'nil?'
+
+          condition = condition[1]
+          expected = !expected
+        when :binary
+          left, operator, right = condition.drop(1)
+          break unless operator == :== && nil_literal?(right)
+
+          condition = left
+          expected = !expected
         else
           break
         end
       end
       [condition, expected]
     end
 
+    def nil_literal?(node)
+      node&.first == :var_ref && node.dig(1, 0) == :@kw && node.dig(1, 1) == 'nil'
+    end
+
     def guarded_constant_name(condition, namespace)
       if condition&.first == :defined
         return constant_name_from_node(condition[1], namespace)

test/argument_parser_test.rb

@@ -454,6 +454,15 @@ def test_required_integer_option_accepts_negative_radix_values
     end
   end
 
+  def test_required_integer_option_accepts_negative_decimal_with_separator
+    method = IntegerOptionSamples.method(:count)
+
+    pos_args, kw_args = @parser.parse(['--count', '-1_000'], method)
+
+    assert_empty pos_args
+    assert_equal({ count: -1000 }, kw_args)
+  end
+
   def test_json_type_accepts_an_array_literal
     method = JsonTypeSamples.method(:accept)
 

test/constant_capture_test.rb

@@ -652,6 +652,8 @@ module CaptureEquivalentGuardOwner; end
         CaptureEquivalentGuardOwner.const_defined?(:Runner, false) || (CaptureEquivalentGuardOwner::Runner = CaptureEquivalentGuardSource)
         CaptureNegatedGuardAlias = CaptureEquivalentGuardSource if !(defined?(CaptureNegatedGuardAlias))
         defined?(CaptureTernaryGuardAlias) ? nil : (CaptureTernaryGuardAlias = CaptureEquivalentGuardSource)
+        CaptureNilPredicateGuardAlias = CaptureEquivalentGuardSource if defined?(CaptureNilPredicateGuardAlias).nil?
+        CaptureNilEqualityGuardAlias = CaptureEquivalentGuardSource if defined?(CaptureNilEqualityGuardAlias) == nil
         install = -> { CaptureLambdaGuardAlias = CaptureEquivalentGuardSource unless defined?(CaptureLambdaGuardAlias) }
         install.call
       RUBY
@@ -661,6 +663,8 @@ module CaptureEquivalentGuardOwner; end
         CaptureEquivalentGuardOwner::Runner
         CaptureNegatedGuardAlias
         CaptureTernaryGuardAlias
+        CaptureNilPredicateGuardAlias
+        CaptureNilEqualityGuardAlias
         CaptureLambdaGuardAlias
       ]
       2.times do
@@ -678,6 +682,8 @@ module CaptureEquivalentGuardOwner; end
       cleanup_constant(:CaptureEquivalentGuardSource)
       cleanup_constant(:CaptureNegatedGuardAlias)
       cleanup_constant(:CaptureTernaryGuardAlias)
+      cleanup_constant(:CaptureNilPredicateGuardAlias)
+      cleanup_constant(:CaptureNilEqualityGuardAlias)
       cleanup_constant(:CaptureLambdaGuardAlias)
     end
   end