akr	2008-09-02 21:22:56 +0900 (Tue, 02 Sep 2008)

  New Revision: 19069

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19069

  Log:
    * tool/transcode-tblgen.rb: add prefix for byte_array and word_array.

  Modified files:
    trunk/ChangeLog
    trunk/tool/transcode-tblgen.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19068)
+++ ChangeLog	(revision 19069)
@@ -1,3 +1,7 @@
+Tue Sep  2 21:22:22 2008  Tanaka Akira  <akr@f...>
+
+	* tool/transcode-tblgen.rb: add prefix for byte_array and word_array.
+
 Tue Sep  2 20:57:14 2008  Tanaka Akira  <akr@f...>
 
 	* enc/trans/make_transdb.rb: check foo.c only if foo.trans exists.
Index: tool/transcode-tblgen.rb
===================================================================
--- tool/transcode-tblgen.rb	(revision 19068)
+++ tool/transcode-tblgen.rb	(revision 19069)
@@ -328,7 +328,7 @@
       if bytes_code.empty?
         bytes_code << <<"End"
 static const unsigned char
-byte_array[0] = {
+#{OUTPUT_PREFIX}byte_array[0] = {
 };
 End
       end
@@ -345,7 +345,7 @@
     if words_code.empty?
       words_code << <<"End"
 static const uintptr_t
-word_array[0] = {
+#{OUTPUT_PREFIX}word_array[0] = {
 };
 End
     end
@@ -609,7 +609,7 @@
 def transcode_generated_code
   TRANSCODE_GENERATED_BYTES_CODE +
     TRANSCODE_GENERATED_WORDS_CODE +
-    "\#define TRANSCODE_TABLE_INFO byte_array, word_array, sizeof(uintptr_t)\n" +
+    "\#define TRANSCODE_TABLE_INFO #{OUTPUT_PREFIX}byte_array, #{OUTPUT_PREFIX}word_array, sizeof(uintptr_t)\n" +
     TRANSCODE_GENERATED_TRANSCODER_CODE
 end
 
@@ -716,6 +716,11 @@
 
 VERBOSE_MODE = verbose_mode
 
+OUTPUT_FILENAME = output_filename
+OUTPUT_PREFIX = output_filename ? File.basename(output_filename)[/\A[A-Za-z0-9_]*/] : ""
+OUTPUT_PREFIX.sub!(/\A_+/, '')
+OUTPUT_PREFIX.sub!(/_*\z/, '_')
+
 arg = ARGV.shift
 $srcdir = File.dirname(arg)
 $:.unshift $srcdir unless $:.include? $srcdir

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