diff options
author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-02 22:18:14 +0000 |
---|---|---|
committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-02-02 22:18:14 +0000 |
commit | 89ef6628ebad27dab097f0c0d09ec50637cdab4b (patch) | |
tree | 6e2753c0d768ac59a42b5d44015af6c94c91bf84 | |
parent | 71bf292ba1159f04892d40796ebcba1c59861496 (diff) | |
download | ruby-89ef6628ebad27dab097f0c0d09ec50637cdab4b.tar.gz |
* re.c (Init_Regexp): added a constant for ARG_ENCODING_NONE
[ruby-core:35054]
* test/ruby/test_regexp.rb: corresponding test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30765 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | re.c | 1 | ||||
-rw-r--r-- | test/ruby/test_regexp.rb | 6 |
3 files changed, 14 insertions, 0 deletions
@@ -1,3 +1,10 @@ +Thu Feb 3 07:16:11 2011 Aaron Patterson <aaron@tenderlovemaking.com> + + * re.c (Init_Regexp): added a constant for ARG_ENCODING_NONE + [ruby-core:35054] + + * test/ruby/test_regexp.rb: corresponding test. + Thu Feb 3 07:02:16 2011 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych/visitors/to_ruby.rb: ARG_ENCODING_NONE regular @@ -3562,6 +3562,7 @@ Init_Regexp(void) rb_define_const(rb_cRegexp, "EXTENDED", INT2FIX(ONIG_OPTION_EXTEND)); rb_define_const(rb_cRegexp, "MULTILINE", INT2FIX(ONIG_OPTION_MULTILINE)); rb_define_const(rb_cRegexp, "FIXEDENCODING", INT2FIX(ARG_ENCODING_FIXED)); + rb_define_const(rb_cRegexp, "NOENCODING", INT2FIX(ARG_ENCODING_NONE)); rb_global_variable(®_cache); diff --git a/test/ruby/test_regexp.rb b/test/ruby/test_regexp.rb index b0a9eb2c16..1bc2d0a79f 100644 --- a/test/ruby/test_regexp.rb +++ b/test/ruby/test_regexp.rb @@ -11,6 +11,12 @@ class TestRegexp < Test::Unit::TestCase $VERBOSE = @verbose end + def test_has_NOENCODING + assert Regexp::NOENCODING + re = //n + assert_equal Regexp::NOENCODING, re.options + end + def test_ruby_dev_999 assert_match(/(?<=a).*b/, "aab") assert_match(/(?<=\u3042).*b/, "\u3042ab") |