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

fix Resolv::LOC::Coord.create.

Browse Source 
* lib/resolv.rb (Resolv::LOC::Coord.create): fixed.
  [ruby-core:72567] [Bug #11912] fixed by Eric Wong and Kazuhiro
  NISHIYAMA.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56604 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2016-11-05 15:19:21 +00:00
parent 825e191296
commit 7d27c0a2d8
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Nov 6 00:06:38 2016 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::LOC::Coord.create): fixed.
[ruby-core:72567] [Bug #11912] fixed by Eric Wong and Kazuhiro
NISHIYAMA.
Sun Nov 6 00:03:09 2016 NARUSE, Yui <naruse@ruby-lang.org> Sun Nov 6 00:03:09 2016 NARUSE, Yui <naruse@ruby-lang.org>
* configure.in (-Wimplicit-fallthrough): gcc7 introduces case * configure.in (-Wimplicit-fallthrough): gcc7 introduces case

10
lib/resolv.rb
View File

@ -2699,10 +2699,12 @@ class Resolv
return arg return arg
when String when String
coordinates = '' coordinates = ''
if Regex =~ arg && $1<180 if Regex =~ arg && $1.to_f < 180
hemi = ($4[/([NE])/,1]) || ($4[/([SW])/,1]) ? 1 : -1 m = $~
coordinates = [(($1.to_i*(36e5))+($2.to_i*(6e4))+($3.to_f*(1e3)))*hemi+(2**31)].pack("N") hemi = (m[4][/[NE]/]) || (m[4][/[SW]/]) ? 1 : -1
(orientation ||= '') << $4[[/NS/],1] ? 'lat' : 'lon' coordinates = [ ((m[1].to_i*(36e5)) + (m[2].to_i*(6e4)) +
(m[3].to_f*(1e3))) * hemi+(2**31) ].pack("N")
orientation = m[4][/[NS]/] ? 'lat' : 'lon'
else else
raise ArgumentError.new("not a properly formed Coord string: " + arg) raise ArgumentError.new("not a properly formed Coord string: " + arg)
end end

4
test/resolv/test_resource.rb
View File

@ -19,4 +19,8 @@ class TestResolvResource < Test::Unit::TestCase
bug10857 = '[ruby-core:68128] [Bug #10857]' bug10857 = '[ruby-core:68128] [Bug #10857]'
assert_equal(@name1.hash, @name2.hash, bug10857) assert_equal(@name1.hash, @name2.hash, bug10857)
end end
def test_coord
Resolv::LOC::Coord.create('1 2 1.1 N')
end
end end