1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ruby2_keywords warnings: Quote non-UTF8 method names fully

Browse Source 
It used to quote only part of the method name because NUL byte in
the method terminates the C string:

```
(irb)> "abcdef".encode("UTF-16LE").bytes
=> [97, 0, 98, 0, 99, 0, 100, 0, 101, 0, 102, 0]
```

```
expected: /abcdef/
actual: warning: Skipping set of ruby2_keywords flag for a (method not defined in Ruby)\n".
```
This commit is contained in:
Alan Wu 2024-12-19 10:32:14 -05:00 committed by GitHub
parent 7b2ae8df90
commit ce849d565b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
Notes: git 2025-04-09 13:49:37 +00:00 
Merged: https://github.com/ruby/ruby/pull/12396

Merged-By: XrXr
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/ruby/test_keyword.rb
View File

@ -2794,6 +2794,12 @@ class TestKeywordArguments < Test::Unit::TestCase
assert_nil(c.send(:ruby2_keywords, :bar)) assert_nil(c.send(:ruby2_keywords, :bar))
end end
utf16_sym = "abcdef".encode("UTF-16LE").to_sym
c.send(:define_method, utf16_sym, c.instance_method(:itself))
assert_warn(/abcdef/) do
assert_nil(c.send(:ruby2_keywords, utf16_sym))
end
o = Object.new o = Object.new
class << o class << o
alias bar p alias bar p

8
vm_method.c
View File

@ -2605,7 +2605,7 @@ rb_mod_ruby2_keywords(int argc, VALUE *argv, VALUE module)
rb_clear_method_cache(module, name); rb_clear_method_cache(module, name);
} }
else { else {
rb_warn("Skipping set of ruby2_keywords flag for %s (method accepts keywords or method does not accept argument splat)", rb_id2name(name)); rb_warn("Skipping set of ruby2_keywords flag for %"PRIsVALUE" (method accepts keywords or method does not accept argument splat)", QUOTE_ID(name));
} }
break; break;
case VM_METHOD_TYPE_BMETHOD: { case VM_METHOD_TYPE_BMETHOD: {
@ -2624,19 +2624,19 @@ rb_mod_ruby2_keywords(int argc, VALUE *argv, VALUE module)
rb_clear_method_cache(module, name); rb_clear_method_cache(module, name);
} }
else { else {
rb_warn("Skipping set of ruby2_keywords flag for %s (method accepts keywords or method does not accept argument splat)", rb_id2name(name)); rb_warn("Skipping set of ruby2_keywords flag for %"PRIsVALUE" (method accepts keywords or method does not accept argument splat)", QUOTE_ID(name));
} }
break; break;
} }
} }
/* fallthrough */ /* fallthrough */
default: default:
rb_warn("Skipping set of ruby2_keywords flag for %s (method not defined in Ruby)", rb_id2name(name)); rb_warn("Skipping set of ruby2_keywords flag for %"PRIsVALUE" (method not defined in Ruby)", QUOTE_ID(name));
break; break;
} }
} }
else { else {
rb_warn("Skipping set of ruby2_keywords flag for %s (can only set in method defining module)", rb_id2name(name)); rb_warn("Skipping set of ruby2_keywords flag for %"PRIsVALUE" (can only set in method defining module)", QUOTE_ID(name));
} }
} }
return Qnil; return Qnil;