shyouhei	2008-06-08 01:30:49 +0900 (Sun, 08 Jun 2008)

  New Revision: 16891

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/bcc32/mkexports.rb
    branches/ruby_1_8_5/version.h
    branches/ruby_1_8_5/win32/mkexports.rb

  Log:
    merge revision(s) 13694:
    * win32/mkexports.rb: deal with __fastcall name decorations.
      [ruby-list:44111]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/bcc32/mkexports.rb?r1=16891&r2=16890&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/win32/mkexports.rb?r1=16891&r2=16890&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=16891&r2=16890&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=16891&r2=16890&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 16890)
+++ ruby_1_8_5/ChangeLog	(revision 16891)
@@ -1,3 +1,8 @@
+Sun Jun  8 01:28:42 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/mkexports.rb: deal with __fastcall name decorations.
+	  [ruby-list:44111]
+
 Sun Jun  8 01:23:29 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/rexml/source.rb (REXML::SourceFactory::SourceFactory): typo
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 16890)
+++ ruby_1_8_5/version.h	(revision 16891)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-08"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080608
-#define RUBY_PATCHLEVEL 133
+#define RUBY_PATCHLEVEL 134
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/bcc32/mkexports.rb
===================================================================
--- ruby_1_8_5/bcc32/mkexports.rb	(revision 16890)
+++ ruby_1_8_5/bcc32/mkexports.rb	(revision 16891)
@@ -5,7 +5,7 @@
 ARGV.each do |obj|
   IO.foreach("|tdump -q -oiPUBDEF -oiPUBD32 #{obj.tr('/', '\\')}") do |l|
     next unless /(?:PUBDEF|PUBD32)/ =~ l
-    SYM[$1] = !$2 if /'(.*?)'\s+Segment:\s+_(TEXT)?/ =~ l
+    SYM[$1] = true if /'(.*?)'/ =~ l
   end
 end
 
@@ -16,10 +16,7 @@
   exports << "Library " + $library
 end
 exports << "Description " + $description.dump if $description
-exports << "EXPORTS"
-SYM.sort.each do |sym, is_data|
-  exports << (is_data ? "#{sym} DATA" : sym)
-end
+exports << "EXPORTS" << SYM.keys.sort
 
 if $output
   open($output, 'w') {|f| f.puts exports.join("\n")}
Index: ruby_1_8_5/win32/mkexports.rb
===================================================================
--- ruby_1_8_5/win32/mkexports.rb	(revision 16890)
+++ ruby_1_8_5/win32/mkexports.rb	(revision 16891)
@@ -7,8 +7,9 @@
   next if /^[0-9A-F]+ 0+ UNDEF / =~ l
   next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, "")
   is_data = !$1
-  if l.sub!(/^_/, '')
-    next if /@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l
+  if /^[@_](?!\w+@\d+$)/ =~ l
+    next if /(?!^)@.*@/ =~ l || /@[0-9a-f]{16}$/ =~ l
+    l.sub!(/^[@_]/, '')
   elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
     next
   end

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