[前][次][番号順一覧][スレッド一覧]

ruby-changes:51881

From: nobu <ko1@a...>
Date: Sun, 29 Jul 2018 09:09:19 +0900 (JST)
Subject: [ruby-changes:51881] nobu:r64095 (trunk): mkexports.rb: flip-flop

nobu	2018-07-29 09:09:08 +0900 (Sun, 29 Jul 2018)

  New Revision: 64095

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64095

  Log:
    mkexports.rb: flip-flop
    
    * win32/mkexports.rb (Exports::Mswin#each_export): get rid of
      flip-flop warning.  [ruby-core:88147] [Bug #14946]

  Modified files:
    trunk/win32/mkexports.rb
Index: win32/mkexports.rb
===================================================================
--- win32/mkexports.rb	(revision 64094)
+++ win32/mkexports.rb	(revision 64095)
@@ -109,7 +109,11 @@ class Exports::Mswin < Exports https://github.com/ruby/ruby/blob/trunk/win32/mkexports.rb#L109
     objs = objs.collect {|s| s.tr('/', '\\')}
     filetype = nil
     objdump(objs) do |l|
-      if (filetype = l[/^File Type: (.+)/, 1])..(/^\f/ =~ l)
+      if filetype
+        if /^\f/ =~ l
+          filetype = nil
+          next
+        end
         case filetype
         when /OBJECT/, /LIBRARY/
           next if /^[[:xdigit:]]+ 0+ UNDEF / =~ l
@@ -130,6 +134,8 @@ class Exports::Mswin < Exports https://github.com/ruby/ruby/blob/trunk/win32/mkexports.rb#L134
           next
         end
         yield l.strip, is_data
+      else
+        filetype = l[/^File Type: (.+)/, 1]
       end
     end
     yield "strcasecmp", "msvcrt.stricmp"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]