diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-13 14:29:12 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-13 14:29:12 +0000 |
| commit | 21671b558cfd8d90647f40a8594fd9e6db038768 () | |
| tree | 5204ff9fd0eb5569165d17423523fa36ca63c267 | |
| parent | 62c596cb36af5471e65a4774dfe70047055f58b7 (diff) | |
* enc/make_encdb.h: sort encoding names by original name.
* encoding.c, enc/*.c: define replicas and aliases. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15025 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | enc/euc_jp.c | 3 | ||||
| -rw-r--r-- | enc/iso_8859_1.c | 3 | ||||
| -rw-r--r-- | enc/iso_8859_10.c | 1 | ||||
| -rw-r--r-- | enc/iso_8859_11.c | 3 | ||||
| -rw-r--r-- | enc/iso_8859_13.c | 1 | ||||
| -rw-r--r-- | enc/iso_8859_14.c | 1 | ||||
| -rw-r--r-- | enc/iso_8859_15.c | 1 | ||||
| -rw-r--r-- | enc/iso_8859_16.c | 1 | ||||
| -rw-r--r-- | enc/iso_8859_2.c | 3 | ||||
| -rw-r--r-- | enc/iso_8859_3.c | 1 | ||||
| -rw-r--r-- | enc/iso_8859_4.c | 3 | ||||
| -rw-r--r-- | enc/iso_8859_5.c | 3 | ||||
| -rw-r--r-- | enc/iso_8859_6.c | 3 | ||||
| -rw-r--r-- | enc/iso_8859_7.c | 3 | ||||
| -rw-r--r-- | enc/iso_8859_8.c | 3 | ||||
| -rw-r--r-- | enc/iso_8859_9.c | 3 | ||||
| -rwxr-xr-x | enc/make_encdb.rb | 8 | ||||
| -rw-r--r-- | enc/us_ascii.c | 2 | ||||
| -rw-r--r-- | encoding.c | 7 |
20 files changed, 52 insertions, 7 deletions
@@ -1,3 +1,9 @@ Sun Jan 13 20:24:03 2008 NARUSE, Yui <[email protected]> * encoding.c: add documents. @@ -364,3 +364,6 @@ OnigEncodingDefine(euc_jp, EUC_JP) = { 0 }; ENC_ALIAS("eucJP", "EUC-JP"); /* UI-OSF Application Platform Profile for Japanese Environment Version 1.1 */ @@ -272,3 +272,6 @@ OnigEncodingDefine(iso_8859_1, ISO_8859_1) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -241,3 +241,4 @@ OnigEncodingDefine(iso_8859_10, ISO_8859_10) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -94,3 +94,6 @@ OnigEncodingDefine(iso_8859_11, ISO_8859_11) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -230,3 +230,4 @@ OnigEncodingDefine(iso_8859_13, ISO_8859_13) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -243,3 +243,4 @@ OnigEncodingDefine(iso_8859_14, ISO_8859_14) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -237,3 +237,4 @@ OnigEncodingDefine(iso_8859_15, ISO_8859_15) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -239,3 +239,4 @@ OnigEncodingDefine(iso_8859_16, ISO_8859_16) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -237,3 +237,6 @@ OnigEncodingDefine(iso_8859_2, ISO_8859_2) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -237,3 +237,4 @@ OnigEncodingDefine(iso_8859_3, ISO_8859_3) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -239,3 +239,6 @@ OnigEncodingDefine(iso_8859_4, ISO_8859_4) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -227,3 +227,6 @@ OnigEncodingDefine(iso_8859_5, ISO_8859_5) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -94,3 +94,6 @@ OnigEncodingDefine(iso_8859_6, ISO_8859_6) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -224,3 +224,6 @@ OnigEncodingDefine(iso_8859_7, ISO_8859_7) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -94,3 +94,6 @@ OnigEncodingDefine(iso_8859_8, ISO_8859_8) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -230,3 +230,6 @@ OnigEncodingDefine(iso_8859_9, ISO_8859_9) = { onigenc_single_byte_left_adjust_char_head, onigenc_always_true_is_allowed_reverse_match }; @@ -13,7 +13,7 @@ encodings = [] replicas = {} aliases = {} encdir = ARGV[0] -Dir.open(encdir) {|d| d.grep(/.+\.c\z/)}.each do |fn| open(File.join(encdir,fn)) do |f| orig = nil name = nil @@ -26,19 +26,19 @@ Dir.open(encdir) {|d| d.grep(/.+\.c\z/)}.each do |fn| encodings << $1 if $1 f.each_line do |line| if /^ENC_REPLICATE\(\s*"([^"]+)"\s*,\s*"([^"]+)"/o =~ line replicas[$1] = $2 elsif /^ENC_ALIAS\(\s*"([^"]+)"\s*,\s*"([^"]+)"/o =~ line aliases[$1] = $2 end end end end -p aliases open('encdb.h', 'wb') do |f| f.puts 'static const char *const enc_name_list[] = {' encodings.each {|name| f.puts' "%s",' % name} - replicas.each_key {|name| f.puts' "%s",' % name} - aliases.each_key {|name| f.puts' "%s",' % name} f.puts('};', '', 'static void', 'enc_init_db(void)', '{') replicas.each_pair {|name, orig| f.puts ' ENC_REPLICATE("%s", "%s");' % [name, orig] @@ -28,4 +28,4 @@ OnigEncodingDefine(us_ascii, US_ASCII) = { }; ENC_ALIAS("ASCII", "US-ASCII"); ENC_ALIAS("ANSI_X3.4-1986", "US-ASCII"); - @@ -1087,10 +1087,13 @@ Init_Encoding(void) rb_define_singleton_method(rb_cEncoding, "default_external", get_default_external, 0); rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0); /* dummy for unsupported, statefull encoding */ rb_define_dummy_encoding("ISO-2022-JP"); - - enc_init_db(); } /* locale insensitive functions */ |