nobu	2007-10-14 03:55:54 +0900 (Sun, 14 Oct 2007)

  New Revision: 13694

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

  Log:
    * win32/mkexports.rb: deal with __fastcall name decorations.
      [ruby-list:44111]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/bcc32/mkexports.rb?r1=13694&r2=13693
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/mkexports.rb?r1=13694&r2=13693
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13694&r2=13693
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13694&r2=13693
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=13694&r2=13693
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/mkexports.rb?r1=13694&r2=13693
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/mkexports.rb?r1=13694&r2=13693

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13693)
+++ ChangeLog	(revision 13694)
@@ -1,3 +1,8 @@
+Sun Oct 14 03:55:52 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/mkexports.rb: deal with __fastcall name decorations.
+	  [ruby-list:44111]
+
 Sun Oct 14 02:20:40 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* encoding.c (rb_cEncoding): new Encoding class.
Index: win32/mkexports.rb
===================================================================
--- win32/mkexports.rb	(revision 13693)
+++ win32/mkexports.rb	(revision 13694)
@@ -92,9 +92,9 @@
             next if /^[[:xdigit:]]+ 0+ UNDEF / =~ l
             next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, '')
             is_data = !$1
-            if noprefix or l.sub!(/^_/, '')
-              next if /@.*@/ =~ l || /@[[:xdigit:]]{16}$/ =~ l
-              l.sub!(/^/, '_') if /@\d+$/ =~ l
+            if noprefix or /^[@_]/ =~ l
+              next if /(?!^)@.*@/ =~ l || /@[[:xdigit:]]{16}$/ =~ l
+              l.sub!(/^[@_]/, '') if /@\d+$/ !~ l
             elsif !l.sub!(/^(\S+) \([^@?\`\']*\)$/, '\1')
               next
             end
Index: bcc32/mkexports.rb
===================================================================
--- bcc32/mkexports.rb	(revision 13693)
+++ bcc32/mkexports.rb	(revision 13694)
@@ -15,7 +15,7 @@
     opt = /\.(?:so|dll)\z/i =~ obj ? "-ee" : "-oiPUBDEF -oiPUBD32"
     IO.foreach("|tdump -q #{opt} #{obj.tr('/', '\\')} < nul") do |l|
       next unless /(?:PUBDEF|PUBD32|EXPORT)/ =~ l
-        yield $1, !$2 /'(.*?)'\s+Segment:\s+_(TEXT)?/ =~ l
+        yield $1 if /'(.*?)'/ =~ l
       end
     end
     yield "_strcasecmp", "_stricmp"
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13693)
+++ ruby_1_8/ChangeLog	(revision 13694)
@@ -1,3 +1,8 @@
+Sun Oct 14 03:55:52 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32/mkexports.rb: deal with __fastcall name decorations.
+	  [ruby-list:44111]
+
 Sat Oct 13 09:02:16 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* {bcc,win}32/mkexports.rb: explicit data.  [ruby-list:44108]
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 13693)
+++ ruby_1_8/version.h	(revision 13694)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-10-13"
+#define RUBY_RELEASE_DATE "2007-10-14"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20071013
+#define RUBY_RELEASE_CODE 20071014
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 14
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/bcc32/mkexports.rb
===================================================================
--- ruby_1_8/bcc32/mkexports.rb	(revision 13693)
+++ ruby_1_8/bcc32/mkexports.rb	(revision 13694)
@@ -7,7 +7,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
 
@@ -18,10 +18,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/win32/mkexports.rb
===================================================================
--- ruby_1_8/win32/mkexports.rb	(revision 13693)
+++ ruby_1_8/win32/mkexports.rb	(revision 13694)
@@ -9,8 +9,9 @@
   next if /^[0-9A-F]+ 0+ UNDEF / =~ l
   next unless l.sub!(/.*?\s(\(\)\s+)?External\s+\|\s+/, "")
   is_data = !$1
-  if l.sub!(/^_(?!\w+@\d+$)/, '')
-    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