diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/psych/lib/psych/visitors/to_ruby.rb | 4 | ||||
| -rw-r--r-- | ext/syck/lib/syck/rubytypes.rb | 2 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Thu Feb 3 07:20:46 2011 Aaron Patterson <aaron@tenderlovemaking.com> + + * ext/psych/lib/psych/visitors/to_ruby.rb: use Regexp::NOENCODING + rather than magic number. + + * ext/syck/lib/syck/rubytypes.rb: ditto + Thu Feb 3 07:16:11 2011 Aaron Patterson <aaron@tenderlovemaking.com> * re.c (Init_Regexp): added a constant for ARG_ENCODING_NONE diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb index a68c8e698e..f8b15859e1 100644 --- a/ext/psych/lib/psych/visitors/to_ruby.rb +++ b/ext/psych/lib/psych/visitors/to_ruby.rb @@ -69,9 +69,7 @@ module Psych when 'x' then options |= Regexp::EXTENDED when 'i' then options |= Regexp::IGNORECASE when 'm' then options |= Regexp::MULTILINE - - # FIXME: there is no constant for ARG_ENCODING_NONE - when 'n' then options |= 32 + when 'n' then options |= Regexp::NOENCODING else lang = option end end diff --git a/ext/syck/lib/syck/rubytypes.rb b/ext/syck/lib/syck/rubytypes.rb index 883c8d5bfc..31b1e2b804 100644 --- a/ext/syck/lib/syck/rubytypes.rb +++ b/ext/syck/lib/syck/rubytypes.rb @@ -271,7 +271,7 @@ class Regexp mods |= Regexp::EXTENDED if val['mods'].include?( 'x' ) mods |= Regexp::IGNORECASE if val['mods'].include?( 'i' ) mods |= Regexp::MULTILINE if val['mods'].include?( 'm' ) - mods |= 32 if val['mods'].include?( 'n' ) + mods |= Regexp::NOENCODING if val['mods'].include?( 'n' ) end val.delete( 'mods' ) r = YAML::object_maker( klass, {} ) |